Changeset 19552 in osm for applications/editors/josm/i18n/po/fi.po

Timestamp:

2010-01-18T21:09:26+01:00 (15 years ago)

Author:

matthiasj

Message:

Update .po files from JOSM SVN r2875

File:

• applications/editors/josm/i18n/po/fi.po (modified) (771 diffs)

applications/editors/josm/i18n/po/fi.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 19:33+0100\n"
-"PO-Revision-Date: 2010-01-10 17:11+0000\n"
+"POT-Creation-Date: 2010-01-18 14:05-0500\n"
+"PO-Revision-Date: 2010-01-17 00:59-0500\n"
 "Last-Translator: Matti Kujala <oh1qt@sral.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -20 +20 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:206
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31 +31 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:384
+#: ../core/src/org/openstreetmap/josm/Main.java:378
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:385
-#: ../core/src/org/openstreetmap/josm/Main.java:418
-#: ../core/src/org/openstreetmap/josm/Main.java:486
+#: ../core/src/org/openstreetmap/josm/Main.java:379
+#: ../core/src/org/openstreetmap/josm/Main.java:412
+#: ../core/src/org/openstreetmap/josm/Main.java:480
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126
@@ -60 +60 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
@@ -79 +79 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:240
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:454
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
@@ -92 +92 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
+#: ../core/src/org/openstreetmap/josm/Main.java:411
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:485
+#: ../core/src/org/openstreetmap/josm/Main.java:479
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -115 +115 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:721
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:723
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:732
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:734
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap -editori"
@@ -124 +124 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:69
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
 #, java-format
 msgid "Version {0}"
@@ -199 +199 @@
 #, java-format
 msgid ""
-"You''re about to launch {0} browser windows.<br>This may both clutter your "
+"You are about to launch {0} browser windows.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
@@ -221 +221 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -229 +229 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:158
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -237 +237 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
@@ -251 +251 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
@@ -289 +288 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
 msgid "Merge"
 msgstr "Yhdistä"
@@ -382 +381 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
@@ -402 +401 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
-msgid "Close the dialog, don't create a new node"
+msgid "Close the dialog, do not create a new node"
 msgstr "Sulje ikkuna tekemättä uutta solmua"
 
@@ -420 +419 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
@@ -430 +429 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -444 +443 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 #: ../plugins/terracer/src/terracer/TerracerAction.java:55
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
 msgid "Tool: {0}"
@@ -462 +461 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
@@ -469 +468 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -561 +560 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
 msgid "Close open changesets"
 msgstr "Sulje avoimet muutoskokoelmat"
@@ -572 +571 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
@@ -584 +583 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
 msgstr "Ei avonaisia muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:83
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
 msgstr "Ei avonaisia muutoskokoelmia"
@@ -674 +673 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -730 +729 @@
 msgstr "Lataa karttadataa OSM-palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 msgid "Download parent ways/relations..."
 msgstr "Lataa polut/relaatiot joihin tämä kuuluu..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Lataa kaikki valittuihin objekteihin viittaavat objektit."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:51
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1038
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:179
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:20
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:32
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:45
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parametr ''{0}'' ei saa olla \"null\""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Tuonnin aikana oli {0} konfliktia."
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#, fuzzy, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Tuonnin aikana oli {0} konfliktia."
+msgstr[1] "Tuonnin aikana oli {0} konfliktia."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-msgid "Conflicts during download"
-msgstr "Konflikti latauksen aikana"
+#, fuzzy
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikti latauksen aikana"
+msgstr[1] "Konflikti latauksen aikana"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -809 +771 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
 msgstr "Monista"
@@ -844 +806 @@
 msgstr "Kokoruututila päälle/pois"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
 msgstr "Ei mitään vietävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:39
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:124
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:314
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:426
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:96
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:112
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:141
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:158
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
-#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:54
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
-#, java-format
-msgid "Parameter ''{0}'' must not be null."
-msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
-#, java-format
-msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Vie GPX-tiedosto"
@@ -968 +843 @@
 msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Join overlapping Areas"
 msgstr "Yhdistä päällekkäiset alueet"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
 msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
 msgid "Only up to two areas can be joined at the moment."
 msgstr "Vain kaksi aluetta voidaan yhdistää tällä hetkellä."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138
-#, java-format
-msgid "\"{0}\" is not closed and therefore can't be joined."
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
+#, java-format
+msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-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?"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#, fuzzy
+msgid "The selected way has nodes outside of the downloaded data region."
+msgid_plural ""
+"The selected ways have nodes outside of the downloaded data region."
+msgstr[0] "Valittu polku ei sisällä valittua pistettä."
+msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
+msgid "This can lead to nodes being deleted accidentally."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
+msgid "Are you really sure to continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70
 msgid "Please abort if you are not sure"
 msgstr "Ole hyvä ja keskeytä toiminto jos et ole varma"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
 msgstr "Leikkauspisteitä ei löytynyt. Mitään ei muutettu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
 msgid "Added node on all intersections"
 msgstr "Lisättiin piste kaikkiin leikkauskohtiin"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Fix relations"
 msgstr "Korjaa relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1036 +918 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
 msgid "Enter values for all conflicts."
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 msgid "Solve Conflicts"
 msgstr "Ratkaise ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
 msgid "Closed Way"
 msgstr "Suljettu polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
 msgid "Join Areas Function"
 msgstr "Yhdistä alueet -tominto"
@@ -1106 +988 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "URL"
 msgstr "URL"
@@ -1134 +1016 @@
 msgstr "Liitä nykyinen taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Yhdistä pisteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Yhdistää pisteet vanhimpaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:127
 msgid "Abort Merging"
 msgstr "Peru sulautus"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129
 msgid "Click to abort merging nodes"
 msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136
 #, java-format
 msgid ""
@@ -1163 +1045 @@
 "vielä käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229
 #, java-format
 msgid "Merge {0} nodes"
@@ -1263 +1145 @@
 msgstr "Avaa tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
 msgid "Opening 1 file..."
 msgstr "Avataan 1 tiedosto..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:163
-#, java-format
-msgid "Opening {0} files..."
-msgstr "Avataan {0} tiedostoa..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
+#, fuzzy, java-format
+msgid "Opening {0} file..."
+msgid_plural "Opening {0} files..."
+msgstr[0] "Avataan {0} tiedostoa..."
+msgstr[1] "Avataan {0} tiedostoa..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1291 +1175 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-msgid "Select if the data should be downloaded in a new layer"
+msgid "Select if the data should be downloaded into a new layer"
 msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
 
@@ -1321 +1205 @@
 msgid "Download Data"
 msgstr "Lataa dataa"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+msgid ""
+"When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"can undo the movement for certain nodes:<br>Select them and press the "
+"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1465 +1358 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1475 +1368 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../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:1064
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
@@ -1495 +1388 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:216
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
@@ -1522 +1414 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:290
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
@@ -1658 +1549 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1671 +1562 @@
 msgstr "Poistaa turhat pisteet polusta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 msgid "Please select at least one way to simplify."
 msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
@@ -1684 +1575 @@
 "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:92
 msgid "Are you sure?"
 msgstr "Oletko varma?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:139
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66
 #, java-format
@@ -1787 +1678 @@
 msgstr "Vaihda asetuksen \"{0}\" tila"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 msgid "UnGlue Ways"
 msgstr "Erota polut"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Monistaa pisteet, jotka ovat monen polun käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
 msgid "This node is not glued to anything else."
 msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
 msgid "None of these nodes are glued to anything else."
 msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
-msgid "None of this way's nodes are glued to anything else."
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgid "None of this way''s nodes are glued to anything else."
 msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "Select either:"
 msgstr "Valitse joko:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One tagged node, or"
 msgstr "* Yksi piste jolla on tageja, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way, or"
 msgstr "* Yksi piste, joka on useamman polun käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1836 +1727 @@
 "polkujen käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1843 +1734 @@
 "käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1854 +1745 @@
 "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
 msgid "Unglued Node"
 msgstr "Irroitettu piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Monista {0} pisteeksi"
 
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Monista {0} pistettä {1} pisteeksi"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#, fuzzy, java-format
+msgid "Dupe {0} node into {1} nodes"
+msgid_plural "Dupe {0} nodes into {1} nodes"
+msgstr[0] "Monista {0} pistettä {1} pisteeksi"
+msgstr[1] "Monista {0} pistettä {1} pisteeksi"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1909 +1801 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
 msgid "Download data"
 msgstr ""
@@ -1929 +1821 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
-msgid "Didn''t find an object with id {0} in the current dataset"
+msgid "Did not find an object with id {0} in the current dataset"
 msgstr ""
 
@@ -1969 +1861 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
@@ -1978 +1870 @@
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Lähetä valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Lähetä kaikki valittujen objektion muutokset OSM-palvelimelle"
@@ -2027 +1919 @@
 msgstr "Loitonna"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+msgctxt "audio"
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgctxt "audio"
 msgid "Jump back."
 msgstr "Siirry takaisin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
 #, java-format
 msgid "Audio: {0}"
 msgstr "Ääni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+msgctxt "audio"
 msgid "Faster"
 msgstr "Nopeammin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgctxt "audio"
 msgid "Faster Forward"
 msgstr "Nopeammin eteenpäin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+msgctxt "audio"
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgctxt "audio"
 msgid "Jump forward"
 msgstr "Siirry eteenpäin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+#, fuzzy
+msgctxt "audio"
 msgid "Next Marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgstr "Seuraava kuva"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgctxt "audio"
 msgid "Play next marker."
 msgstr ""
@@ -2078 +1977 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgctxt "audio"
 msgid "Play/Pause"
 msgstr "Toista/tauko"
@@ -2085 +1985 @@
 msgstr "Toista/tauko"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#, fuzzy
+msgctxt "audio"
 msgid "Previous Marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgstr "Edellinen kuva"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#, fuzzy
+msgctxt "audio"
 msgid "Play previous marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgstr "Edellinen kuva"
+
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+msgctxt "audio"
 msgid "Slower"
 msgstr "Hitaammin"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgctxt "audio"
 msgid "Slower Forward"
 msgstr "Hitaammin eteenpäin"
@@ -2181 +2087 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
 msgstr "Poistotila"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
 msgstr "Poista pisteitä tai polkuja."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
@@ -2199 +2105 @@
 msgstr "Tila: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:246
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
@@ -2318 +2224 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:304
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
 msgid "Select"
@@ -2396 +2302 @@
 "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+#, fuzzy
+msgid "<not>"
+msgstr "pohjoinen"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<or>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<left parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<right parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<colon>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<equals>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<key>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<question mark>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<end-of-file>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 msgid "Search..."
 msgstr "Etsi..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search for objects."
@@ -2408 +2351 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a search string."
 msgstr "Anna hakusana."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
 msgid "replace selection"
 msgstr "korvaa valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "add to selection"
 msgstr "lisää valintaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "remove from selection"
 msgstr "poista valinnasta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "find in selection"
 msgstr "Etsi valinnasta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "case sensitive"
 msgstr "kirjainkoko merkitsee"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "regular expression"
 msgstr "säännöllinen lauseke"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
-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 "
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+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"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+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"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
-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"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Sörn</b> - 'Sörn' missä kohtaa vain nimeä"
-
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
-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>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr "<b>name:Sörn</b> - ''Sörn'' missä kohtaa vain nimeä"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr "<b>type=route</b> - avaimen ''type'' arvo täsmälleen ''route''."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+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> - avaimen ''type'' mitä vain. Kokeile myös <b>*=arvo</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Sörn</b> - 'Sörn' ei missään kohtaa nimeä."
-
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr "<b>-name:Sörn</b> - ''Sörn'' ei missään kohtaa nimeä."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2491 +2438 @@
 "<b>relation</b> (relaatio))"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - käyttäjän muokkaamat objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - anonyymin käyttäjän muokkaamat objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objektin haku ID:llä (0 uusille objekteille)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2511 +2458 @@
 "ole versiota)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2519 +2466 @@
 "objekteilla jota eivät kuulu mihinkään)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2527 +2474 @@
 "nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2535 +2482 @@
 "nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2541 +2488 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - kaikki muokatut objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - kaikki valitut objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - kaikki keskeneräiset objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - kaikki tagittomat objektit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2581 +2528 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
@@ -2593 +2540 @@
 msgstr "Suodin"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:293
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
 #, java-format
 msgid "Found {0} matches"
 msgstr "Löytyi {0} osumaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+#. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#, fuzzy
+msgctxt "search"
 msgid "CS"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+msgstr "E"
+
+#. case insensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+msgctxt "search"
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:322
+#. regex search
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+msgctxt "search"
 msgid "RX"
 msgstr ""
@@ -2654 +2608 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:234
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:276
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:422
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:643
-msgid "Missing right parenthesis"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#, java-format
+msgid "Unexpected token. Expected {0}, found {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Wrong number of parameters for tags operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 #, java-format
 msgid ""
@@ -2696 +2651 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:724
 #, java-format
 msgid ""
@@ -2707 +2662 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:737
 #, java-format
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:729
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744
 #, java-format
 msgid "Incorrect value of version operator: {0}. Number is expected."
@@ -2756 +2711 @@
 msgid ""
 "<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
-"can''t upload them. Please edit the relations and remove the cyclic "
+"cannot upload them. Please edit the relations and remove the cyclic "
 "dependency.</html>"
 msgstr ""
@@ -2788 +2743 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, java-format
-msgid "Added {0} objects"
-msgstr "Lisättiin {0} objekttia"
+#, fuzzy, java-format
+msgid "Added {0} object"
+msgid_plural "Added {0} objects"
+msgstr[0] "Lisättiin {0} objekttia"
+msgstr[1] "Lisättiin {0} objekttia"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2838 +2795 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for {1} objects"
+msgstr "Poista \"{0}\" polusta \"{1}\""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "objekti"
-msgstr[1] "objektit"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
+#, fuzzy, java-format
+msgid "Set {0}={1} for {2} objects"
 msgstr "Aseta {0}={1} kohteelle {2} {3}"
 
@@ -2865 +2813 @@
 msgid ""
 "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
-"conflict can't be added.</html>"
+"conflict cannot be added.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
 msgid "Double conflict"
 msgstr ""
@@ -2876 +2824 @@
 #, java-format
 msgid ""
-"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
 "primitive ''{1}''."
 msgstr ""
@@ -2886 +2834 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:204
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
 msgid ""
-"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
 
@@ -2904 +2852 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
-#, java-format
-msgid "Parameter ''{0}'' must not be empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
+#, fuzzy, java-format
+msgid "Delete node {0}"
+msgstr "Poistotila"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
+#, fuzzy, java-format
+msgid "Delete way {0}"
+msgstr "Poista {0} polku"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
+#, fuzzy, java-format
+msgid "Delete relation {0}"
+msgstr "Poista {0} relaatio"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2945 +2902 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435
 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?"
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 msgstr ""
 "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
@@ -2956 +2912 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
 msgstr ""
@@ -2967 +2923 @@
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
 #, java-format
-msgid "Set the 'modified' flag for node {0}"
+msgid "Set the ''modified'' flag for node {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
-msgid "Set the 'modified' flag for way {0}"
+msgid "Set the ''modified'' flag for way {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
-msgid "Set the 'modified' flag for relation {0}"
+msgid "Set the ''modified'' flag for relation {0}"
 msgstr ""
 
@@ -2987 +2943 @@
 msgstr[1] "Siirrä {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:102
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
-#, java-format
-msgid "Purged {0} objects"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
+#, fuzzy, java-format
+msgid "Purged {0} object"
+msgid_plural "Purged {0} objects"
+msgstr[0] "Lisättiin {0} objekttia"
+msgstr[1] "Lisättiin {0} objekttia"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
 #, java-format
 msgid ""
@@ -3004 +2962 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3041 +2999 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
+#, fuzzy, java-format
+msgid "Undelete {0} primitive"
+msgid_plural "Undelete {0} primitives"
+msgstr[0] "{0} objektiin"
+msgstr[1] "{0} objektiin"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
 #, java-format
-msgid "Resolve version conflicts for node {0}"
+msgid "Resolve version conflict for node {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
 #, java-format
-msgid "Resolve version conflicts for way {0}"
+msgid "Resolve version conflict for way {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, java-format
-msgid "Resolve version conflicts for relation {0}"
-msgstr ""
+#, fuzzy, java-format
+msgid "Resolve version conflict for relation {0}"
+msgstr "Poistetaanko valinta relaatiosta {0}?"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3116 +3076 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Don't apply changes"
+msgid "Do not apply changes"
 msgstr "Älä toteuta muutoksia"
 
@@ -3135 +3095 @@
 msgstr "Automaattinen tagien korjaus"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:53
-#, java-format
-msgid "Expected array of length 4, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:65
-#, java-format
-msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:71
-#, java-format
-msgid "Illegal double value ''{0}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
@@ -3162 +3107 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:113
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:115
-#, java-format
-msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
@@ -3181 +3120 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-"isn't a directory."
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
+"not a directory."
 msgstr ""
 
@@ -3188 +3127 @@
 #, java-format
 msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-"isn't a directory.</html>"
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
+"not a directory.</html>"
 msgstr ""
 
@@ -3301 +3240 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
-msgid "Warning: the revision file '/REVISION' is missing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3324 +3263 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:85
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+msgctxt "compass"
 msgid "S"
 msgstr "E"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+msgctxt "compass"
 msgid "N"
 msgstr "P"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:99
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+msgctxt "compass"
 msgid "W"
 msgstr "L"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+msgctxt "compass"
 msgid "E"
 msgstr "I"
@@ -3346 +3289 @@
 #, java-format
 msgid ""
-"Unable to add primitive {0} to the dataset because it's already included"
+"Unable to add primitive {0} to the dataset because it is already included"
 msgstr ""
 
@@ -3352 +3295 @@
 #, java-format
 msgid ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+"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."
@@ -3390 +3333 @@
 msgid ""
 "Target object with id {0} and version {1} is visible although source object "
-"with lower version {2} is not visible. Can''t deal with this inconsistency. "
+"with lower version {2} is not visible. Cannot deal with this inconsistency. "
 "Keeping target object. "
 msgstr ""
@@ -3403 +3346 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
 msgid "H"
 msgstr ""
@@ -3408 +3352 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+msgctxt "filter"
 msgid "Text"
-msgstr ""
+msgstr "teksti"
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+#, fuzzy
+msgctxt "filter"
 msgid "C"
-msgstr ""
+msgstr "WC"
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+#, fuzzy
+msgctxt "filter"
 msgid "I"
-msgstr ""
+msgstr "ID"
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+msgctxt "filter"
 msgid "M"
 msgstr ""
@@ -3429 +3379 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
+msgctxt "filter"
 msgid "R"
 msgstr ""
@@ -3434 +3385 @@
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
+msgctxt "filter"
 msgid "A"
 msgstr ""
@@ -3439 +3391 @@
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
+#, fuzzy
+msgctxt "filter"
 msgid "D"
-msgstr ""
+msgstr "ID"
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
+msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:264
-#, java-format
-msgid "Expected ID >= 0. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401
-msgid "A primitive with ID = 0 can't be invisible."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgid "A primitive with ID = 0 cannot be invisible."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
-#, java-format
-msgid ""
-"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is "
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#, java-format
+msgid ""
+"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
 "{0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
-msgid ""
-"Can't merge because either of the participating primitives is new and the "
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+msgid ""
+"Cannot merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042
-#, java-format
-msgid ""
-"Can''t merge primitives with different ids. This id is {0}, the other is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
-#, java-format
-msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55
-#, java-format
-msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#, java-format
+msgid ""
+"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
 
@@ -3506 +3440 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"Tag collection can't be applied to a primitive because there are keys with "
+"Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
 msgstr ""
@@ -3516 +3450 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
-#, java-format
-msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:88
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:115
-#, java-format
-msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
@@ -3589 +3501 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
+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."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
+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."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
+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."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr ""
+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."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
@@ -3678 +3591 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -3841 +3754 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "railway"
 msgstr "rata"
@@ -3858 +3771 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
@@ -3885 +3798 @@
 msgstr "Muutoskokoelma {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:75
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:127
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:145
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:178
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:194
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210
 msgid "Not Found"
 msgstr "Ei löytynyt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
@@ -3919 +3832 @@
 msgstr "Ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
 msgid "Authorisation Failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:282
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
+msgid "Authenticationi failed"
+msgstr "Yhteys epäonnistui"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
 msgid "Unknown host"
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:385
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407
 msgid "Object deleted"
 msgstr "Objekti poistettu"
@@ -3954 +3872 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:102
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
@@ -4107 +4024 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
-"Parameters --download, --downloadgps and --selection are processed in this "
+"Parameters --download, --downloadgps, and --selection are processed in this "
 "order."
 msgstr ""
@@ -4115 +4032 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
 msgid "Loading plugins"
 msgstr "Ladataan liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4155 +4072 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
 msgid "Edit"
 msgstr "Muokkaa"
@@ -4233 +4150 @@
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The angle between the previous and the current way segment."
 msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4263 +4180 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:376
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:393
 msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:619
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:628
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4351 +4268 @@
 #: ../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:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4391 +4308 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4406 +4323 @@
 msgstr "Tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4413 +4330 @@
 msgstr "Pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
-#, java-format
-msgid "Tags({0} conflicts)"
-msgstr "Tagit ({0} konfliktia)"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#, fuzzy, java-format
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tagit ({0} konfliktia)"
+msgstr[1] "Tagit ({0} konfliktia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
+#, java-format
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4461 +4382 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374
-#, java-format
-msgid "Parameter current out of range. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
 #, java-format
 msgid "Item {0} not found in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
@@ -4530 +4445 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -4536 +4451 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -4567 +4482 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -4573 +4488 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
 msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -4588 +4503 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -4594 +4509 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
 msgid "Move up the selected elements by one position."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
 msgid "Move down the selected entries by one position."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
@@ -4621 +4536 @@
 msgstr "Poista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
 msgid "Remove the selected entries from the list of merged elements."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756
-msgid "Freeze"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
+msgid "Freeze"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
 msgid "Freeze the current list of merged elements."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
 msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779
 #, java-format
 msgid ""
@@ -4650 +4565 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784
 #, java-format
 msgid ""
@@ -4657 +4572 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802
 #, java-format
 msgid "My version ({0} entry)"
@@ -4664 +4579 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4671 +4586 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4678 +4593 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
 msgid ""
-"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
 "adjustment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
@@ -4696 +4611 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
-msgid "Merged nodes not frozen yet. Can't build resolution command."
-msgstr ""
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180
-#, java-format
-msgid "Unexpected column index. Got {0}."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#, fuzzy
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
+msgstr "Yhdistää pisteet vanhimpaan."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4718 +4628 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
 msgid "Yes, undelete them too"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500
 msgid "No, cancel operation"
 msgstr ""
@@ -4730 +4640 @@
 #, java-format
 msgid ""
-"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
-"the server.<br><br>Do you want to undelete these nodes too?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475
+"There is {0} additional node used by way {1}<br>which is deleted on the "
+"server.<br><br>Do you want to undelete this node too?"
+msgid_plural ""
+"There are {0} additional nodes used by way {1}<br>which are deleted on the "
+"server.<br><br>Do you want to undelete these nodes too?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
-#, java-format
-msgid ""
-"<html>There are {0} additional primitives referred to by relation {1}"
-"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
-"</html>"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
+#, java-format
+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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
 msgid "Undelete dependent primitives?"
 msgstr ""
@@ -4887 +4804 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
 
@@ -4919 +4836 @@
 #: ../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:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4932 +4849 @@
 #: ../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:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4944 +4861 @@
 msgstr "Arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
 msgid "Cannot apply undecided tag merge item."
-msgstr ""
-
-#. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
-#, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4960 +4871 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284
-msgid ">"
 msgstr ""
 
@@ -5020 +4926 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
 msgid "Apply"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
@@ -5031 +4937 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "all"
 msgstr "kaikki"
@@ -5058 +4964 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, java-format
-msgid "Parameter ''{0}'' must not be empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, java-format
-msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "Tag collection doesn't include the selected value ''{0}''."
-msgstr ""
+#, fuzzy, java-format
+msgid "Tag collection does not include the selected value ''{0}''."
+msgstr "Valittu polku ei sisällä valittua pistettä."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
 msgid "Not decided yet."
 msgstr ""
@@ -5118 +5015 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
@@ -5128 +5025 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
@@ -5241 +5138 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid "For selected objects only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -5252 +5149 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
 msgstr "Muutoskokoelmat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
 msgstr "Avaa aktiivisen tason muutoskokoelmat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr "Valitse kaikki objektit jotka ovat valitussa muutoskokoelmassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -5271 +5168 @@
 msgstr "Lataa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
 msgid "Download information about the selected changesets from the OSM server"
 msgstr "Lataa valittujen muutoskokoelmien tiedot OSM-palvelimelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:400
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
 msgid "Closes the selected open changesets"
 msgstr "Sulkee valitut avoimet muutoskokoelmat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:431
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180
 msgid "Show info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
 msgid "Open a web page for each selected changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
 msgid "Details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr "Avaa valitut muutoskokoelmat muutoskokoelmien hallintaikkunaan"
@@ -5309 +5206 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5335 +5232 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Resolve"
 msgstr "Selvitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
@@ -5373 +5270 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this conflict."
+"<html>You did not finish to merge the differences in this conflict."
 "<br>Conflict resolutions won't be applied unless all differences<br>are "
 "resolved.Click <strong>{0}</strong> to close anyway."
@@ -5393 +5290 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5450 +5347 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 msgid "History"
 msgstr "Historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 msgid "Display the history of all selected items."
 msgstr "Näytä valittujen kohteiden historia."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5471 +5368 @@
 msgstr "Lataa uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Display the history of the selected objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 msgid "Toggle visible state of the selected layer."
 msgstr "Näytä/piilota valittu taso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
@@ -5538 +5431 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3016
 msgid "Relations"
 msgstr "Relaatiot"
@@ -5564 +5457 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5605 +5498 @@
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
 #, java-format
 msgid "Selection: {0}"
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:357
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5632 +5525 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:382
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -5638 +5531 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143
 msgid "Authors"
 msgstr "Tekijät"
@@ -5646 +5539 @@
 msgstr "Näytä valittujen kohteiden muokkaajat."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
 #, java-format
 msgid "{0} Author"
@@ -5653 +5546 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150
 msgid "Select primitives submitted by this user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 msgid "Launches a browser with information about the user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:193
 #, java-format
 msgid ""
@@ -5667 +5560 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 #, java-format
 msgid ""
@@ -5674 +5567 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:218
 msgid "Missing encoding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268
 msgid "<new object>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "Author"
 msgstr "Tekijä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "# Objects"
 msgstr "# Objektia"
@@ -5762 +5655 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
 msgid ""
-"<html>JOSM is currently running with an anonymous user. It can't "
+"<html>JOSM is currently running with an anonymous user. It cannot "
 "download<br>your changesets from the OSM server unless you enter your OSM "
 "user name<br>in the JOSM preferences.</html>"
@@ -5773 +5666 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
 msgid "Open"
 msgstr "Avoin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Suljettu"
@@ -5784 +5679 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154
 msgid "anonymous"
 msgstr "anonyymi"
@@ -5797 +5692 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "User"
 msgstr "Käyttäjä"
@@ -5809 +5704 @@
 msgstr "Suljettu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
 msgid "Downloading changeset content"
 msgstr "Ladataan muutoskokoelman sisältöä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:96
-#, java-format
-msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
 msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
@@ -5879 +5768 @@
 #, java-format
 msgid ""
-"<html>The selected object isn''t available in the current<br>edit layer "
+"<html>The selected object is not available in the current<br>edit layer "
 "''{0}''.</html>"
 msgid_plural ""
@@ -5954 +5843 @@
 #. <space />
 #. <key key="highway" value="living_street" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
@@ -5977 +5869 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Ways/Bridleway" label "Edit Bridleway"
-#. <space />
-#. <key key="highway" value="bridleway" />
-#. <optional>
-#. item "Ways/Cycleway" label "Edit Cycleway"
-#. <space />
-#. <key key="highway" value="cycleway" />
-#. <optional>
-#. item "Ways/Footway" label "Edit Footway"
-#. <space />
-#. <key key="highway" value="footway" />
-#. <optional>
-#. item "Ways/Pedestrian" label "Edit Pedestrian Street"
-#. <space />
-#. <key key="highway" value="pedestrian" />
-#. item "Ways/Steps" label "Edit Flight of Steps"
-#. <space />
-#. <key key="highway" value="steps" />
-#. <optional>
 #. item "Ways/Track" label "Edit Track"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Track Grade 1" label "Edit Track of grade 1"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade1" />
-#. <optional>
-#. item "Ways/Track Grade 2" label "Edit Track of grade 2"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade2" />
-#. <optional>
-#. item "Ways/Track Grade 3" label "Edit Track of grade 3"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade3" />
-#. <optional>
-#. item "Ways/Track Grade 4" label "Edit Track of grade 4"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade4" />
-#. <optional>
-#. item "Ways/Track Grade 5" label "Edit Track of grade 5"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade5" />
-#. <optional>
-#. item "Ways/Hiking" label "Edit Hiking"
+#. item "Ways/Path" label "Edit Path"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="hiking" />
 #. <optional>
-#. item "Ways/Mountain Hiking" label "Edit Mountain Hiking"
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="yes" />
 #. <optional>
-#. item "Ways/Demanding Mountain Hiking" label "Edit Demanding Mountain Hiking"
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="no" />
 #. <optional>
-#. item "Ways/Alpine Hiking" label "Edit Alpine Hiking"
+#. item "Ways/Dedicated Footway" label "Edit Footway"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="alpine_hiking" />
+#. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Demanding Alpine Hiking" label "Edit Demanding Alpine Hiking"
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_alpine_hiking" />
-#. <optional>
-#. item "Ways/Difficult Alpine Hiking" label "Edit Difficult Alpine Hiking"
-#. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="difficult_alpine_hiking" />
+#. <key key="highway" value="steps" />
 #. <optional>
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
@@ -6670 +6522 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6676 +6528 @@
 #: build/trans_presets.java:211 build/trans_presets.java:229
 #: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:284 build/trans_presets.java:317
-#: build/trans_presets.java:363 build/trans_presets.java:383
-#: build/trans_presets.java:398 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:475 build/trans_presets.java:494
-#: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:555 build/trans_presets.java:576
-#: build/trans_presets.java:597 build/trans_presets.java:618
-#: build/trans_presets.java:639 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:704
-#: build/trans_presets.java:717 build/trans_presets.java:730
-#: build/trans_presets.java:743 build/trans_presets.java:756
-#: build/trans_presets.java:767 build/trans_presets.java:776
-#: build/trans_presets.java:823 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:913
-#: build/trans_presets.java:1064 build/trans_presets.java:1072
-#: build/trans_presets.java:1080 build/trans_presets.java:1088
-#: build/trans_presets.java:1098 build/trans_presets.java:1106
-#: build/trans_presets.java:1111 build/trans_presets.java:1118
-#: build/trans_presets.java:1125 build/trans_presets.java:1130
-#: build/trans_presets.java:1138 build/trans_presets.java:1147
-#: build/trans_presets.java:1153 build/trans_presets.java:1159
-#: build/trans_presets.java:1164 build/trans_presets.java:1170
-#: build/trans_presets.java:1176 build/trans_presets.java:1185
-#: build/trans_presets.java:1194 build/trans_presets.java:1201
-#: build/trans_presets.java:1209 build/trans_presets.java:1222
-#: build/trans_presets.java:1228 build/trans_presets.java:1237
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1257 build/trans_presets.java:1313
-#: build/trans_presets.java:1360 build/trans_presets.java:1366
-#: build/trans_presets.java:1372 build/trans_presets.java:1378
-#: build/trans_presets.java:1384 build/trans_presets.java:1395
-#: build/trans_presets.java:1404 build/trans_presets.java:1419
-#: build/trans_presets.java:1425 build/trans_presets.java:1433
-#: build/trans_presets.java:1440 build/trans_presets.java:1449
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1551
-#: build/trans_presets.java:1558 build/trans_presets.java:1574
-#: build/trans_presets.java:1581 build/trans_presets.java:1586
-#: build/trans_presets.java:1592 build/trans_presets.java:1598
-#: build/trans_presets.java:1603 build/trans_presets.java:1609
-#: build/trans_presets.java:1615 build/trans_presets.java:1623
-#: build/trans_presets.java:1631 build/trans_presets.java:1639
-#: build/trans_presets.java:1646 build/trans_presets.java:1652
-#: build/trans_presets.java:1659 build/trans_presets.java:1666
-#: build/trans_presets.java:1674 build/trans_presets.java:1681
-#: build/trans_presets.java:1689 build/trans_presets.java:1696
-#: build/trans_presets.java:1702 build/trans_presets.java:1709
-#: build/trans_presets.java:1716 build/trans_presets.java:1723
-#: build/trans_presets.java:1740 build/trans_presets.java:1748
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:1785 build/trans_presets.java:1792
-#: build/trans_presets.java:1798 build/trans_presets.java:1808
-#: build/trans_presets.java:1813 build/trans_presets.java:1821
-#: build/trans_presets.java:1828 build/trans_presets.java:1834
-#: build/trans_presets.java:1840 build/trans_presets.java:1846
-#: build/trans_presets.java:1851 build/trans_presets.java:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1868
-#: build/trans_presets.java:1874 build/trans_presets.java:1879
-#: build/trans_presets.java:1888 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1930
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2029
-#: build/trans_presets.java:2038 build/trans_presets.java:2046
-#: build/trans_presets.java:2052 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2156 build/trans_presets.java:2162
-#: build/trans_presets.java:2168 build/trans_presets.java:2175
-#: build/trans_presets.java:2182 build/trans_presets.java:2190
-#: build/trans_presets.java:2197 build/trans_presets.java:2203
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2222 build/trans_presets.java:2228
-#: build/trans_presets.java:2236 build/trans_presets.java:2243
-#: build/trans_presets.java:2250 build/trans_presets.java:2257
-#: build/trans_presets.java:2265 build/trans_presets.java:2297
-#: build/trans_presets.java:2302 build/trans_presets.java:2312
-#: build/trans_presets.java:2317 build/trans_presets.java:2323
-#: build/trans_presets.java:2329 build/trans_presets.java:2346
-#: build/trans_presets.java:2352 build/trans_presets.java:2358
-#: build/trans_presets.java:2364 build/trans_presets.java:2370
-#: build/trans_presets.java:2380 build/trans_presets.java:2387
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2504 build/trans_presets.java:2512
-#: build/trans_presets.java:2517 build/trans_presets.java:2523
-#: build/trans_presets.java:2530 build/trans_presets.java:2537
-#: build/trans_presets.java:2543 build/trans_presets.java:2549
-#: build/trans_presets.java:2571 build/trans_presets.java:2578
-#: build/trans_presets.java:2585 build/trans_presets.java:2591
-#: build/trans_presets.java:2598 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2616
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2642
-#: build/trans_presets.java:2649 build/trans_presets.java:2655
-#: build/trans_presets.java:2661 build/trans_presets.java:2667
-#: build/trans_presets.java:2673 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2693
-#: build/trans_presets.java:2700 build/trans_presets.java:2706
-#: build/trans_presets.java:2712 build/trans_presets.java:2722
-#: build/trans_presets.java:2731 build/trans_presets.java:2746
-#: build/trans_presets.java:2752 build/trans_presets.java:2760
-#: build/trans_presets.java:2767 build/trans_presets.java:2787
-#: build/trans_presets.java:2798 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2816
-#: build/trans_presets.java:2822 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2849 build/trans_presets.java:2855
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2937
-#: build/trans_presets.java:2946 build/trans_presets.java:2956
-#: build/trans_presets.java:2965 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3003 build/trans_presets.java:3009
-#: build/trans_presets.java:3015 build/trans_presets.java:3021
-#: build/trans_presets.java:3027 build/trans_presets.java:3033
-#: build/trans_presets.java:3039 build/trans_presets.java:3046
-#: build/trans_presets.java:3052 build/trans_presets.java:3057
-#: build/trans_presets.java:3064 build/trans_presets.java:3071
-#: build/trans_presets.java:3077 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3100
-#: build/trans_presets.java:3106 build/trans_presets.java:3113
-#: build/trans_presets.java:3119 build/trans_presets.java:3126
-#: build/trans_presets.java:3132 build/trans_presets.java:3138
-#: build/trans_presets.java:3144 build/trans_presets.java:3150
-#: build/trans_presets.java:3163 build/trans_presets.java:3177
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:282 build/trans_presets.java:302
+#: build/trans_presets.java:335 build/trans_presets.java:381
+#: build/trans_presets.java:401 build/trans_presets.java:416
+#: build/trans_presets.java:433 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:548
+#: build/trans_presets.java:570 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:628
+#: build/trans_presets.java:637 build/trans_presets.java:684
+#: build/trans_presets.java:705 build/trans_presets.java:714
+#: build/trans_presets.java:774 build/trans_presets.java:925
+#: build/trans_presets.java:933 build/trans_presets.java:941
+#: build/trans_presets.java:949 build/trans_presets.java:959
+#: build/trans_presets.java:967 build/trans_presets.java:972
+#: build/trans_presets.java:979 build/trans_presets.java:986
+#: build/trans_presets.java:991 build/trans_presets.java:999
+#: build/trans_presets.java:1008 build/trans_presets.java:1014
+#: build/trans_presets.java:1020 build/trans_presets.java:1025
+#: build/trans_presets.java:1031 build/trans_presets.java:1037
+#: build/trans_presets.java:1046 build/trans_presets.java:1055
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1083 build/trans_presets.java:1089
+#: build/trans_presets.java:1098 build/trans_presets.java:1104
+#: build/trans_presets.java:1110 build/trans_presets.java:1118
+#: build/trans_presets.java:1174 build/trans_presets.java:1221
+#: build/trans_presets.java:1227 build/trans_presets.java:1233
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1256 build/trans_presets.java:1265
+#: build/trans_presets.java:1280 build/trans_presets.java:1286
+#: build/trans_presets.java:1294 build/trans_presets.java:1301
+#: build/trans_presets.java:1310 build/trans_presets.java:1318
+#: build/trans_presets.java:1329 build/trans_presets.java:1339
+#: build/trans_presets.java:1349 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_presets.java:1392
+#: build/trans_presets.java:1412 build/trans_presets.java:1419
+#: build/trans_presets.java:1435 build/trans_presets.java:1442
+#: build/trans_presets.java:1447 build/trans_presets.java:1453
+#: build/trans_presets.java:1459 build/trans_presets.java:1464
+#: build/trans_presets.java:1470 build/trans_presets.java:1476
+#: build/trans_presets.java:1484 build/trans_presets.java:1492
+#: build/trans_presets.java:1500 build/trans_presets.java:1507
+#: build/trans_presets.java:1513 build/trans_presets.java:1520
+#: build/trans_presets.java:1527 build/trans_presets.java:1535
+#: build/trans_presets.java:1542 build/trans_presets.java:1550
+#: build/trans_presets.java:1557 build/trans_presets.java:1563
+#: build/trans_presets.java:1570 build/trans_presets.java:1577
+#: build/trans_presets.java:1584 build/trans_presets.java:1601
+#: build/trans_presets.java:1609 build/trans_presets.java:1624
+#: build/trans_presets.java:1634 build/trans_presets.java:1646
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1669 build/trans_presets.java:1674
+#: build/trans_presets.java:1682 build/trans_presets.java:1689
+#: build/trans_presets.java:1695 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1712
+#: build/trans_presets.java:1717 build/trans_presets.java:1722
+#: build/trans_presets.java:1729 build/trans_presets.java:1735
+#: build/trans_presets.java:1740 build/trans_presets.java:1749
+#: build/trans_presets.java:1758 build/trans_presets.java:1767
+#: build/trans_presets.java:1776 build/trans_presets.java:1785
+#: build/trans_presets.java:1791 build/trans_presets.java:1799
+#: build/trans_presets.java:1805 build/trans_presets.java:1811
+#: build/trans_presets.java:1817 build/trans_presets.java:1823
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1890 build/trans_presets.java:1899
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:1931 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2036 build/trans_presets.java:2043
+#: build/trans_presets.java:2051 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2097
+#: build/trans_presets.java:2104 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2126
+#: build/trans_presets.java:2158 build/trans_presets.java:2163
+#: build/trans_presets.java:2173 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2190
+#: build/trans_presets.java:2207 build/trans_presets.java:2213
+#: build/trans_presets.java:2219 build/trans_presets.java:2225
+#: build/trans_presets.java:2231 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2343
+#: build/trans_presets.java:2350 build/trans_presets.java:2365
+#: build/trans_presets.java:2373 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2391
+#: build/trans_presets.java:2398 build/trans_presets.java:2404
+#: build/trans_presets.java:2410 build/trans_presets.java:2432
+#: build/trans_presets.java:2439 build/trans_presets.java:2446
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2583 build/trans_presets.java:2592
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2621 build/trans_presets.java:2628
+#: build/trans_presets.java:2648 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2690 build/trans_presets.java:2697
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2724
+#: build/trans_presets.java:2731 build/trans_presets.java:2738
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2758 build/trans_presets.java:2765
+#: build/trans_presets.java:2774 build/trans_presets.java:2780
+#: build/trans_presets.java:2786 build/trans_presets.java:2792
+#: build/trans_presets.java:2798 build/trans_presets.java:2807
+#: build/trans_presets.java:2817 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2864
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2882 build/trans_presets.java:2888
+#: build/trans_presets.java:2894 build/trans_presets.java:2900
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2932 build/trans_presets.java:2938
+#: build/trans_presets.java:2947 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2974 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3024
+#: build/trans_presets.java:3038 build/trans_presets.java:3052
 msgid "Name"
 msgstr "Nimi"
@@ -6847 +6694 @@
 msgid "Closed on:"
 msgstr "Suljettu:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
-msgctxt "changeset.state"
-msgid "Open"
-msgstr "Avoin"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
-msgctxt "changeset.state"
-msgid "Closed"
-msgstr "Suljettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
@@ -6921 +6758 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
 msgid ""
-"The current value isn't a valid changeset ID. Please enter an integer value "
+"The current value is not a valid changeset ID. Please enter an integer value "
 "> 0"
 msgstr ""
@@ -6981 +6818 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
-"Can't restrict changeset query to the current user because the current user "
+"Cannot restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
@@ -6987 +6824 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
-msgid "Current value ''{0}'' for user ID isn''t valid"
+msgid "Current value ''{0}'' for user ID is not valid"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
-msgid "Can''t restrict the changeset query to the user name ''{0}''"
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
@@ -7038 +6875 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
-"Can't build changeset query with time based restrictions. Input isn't valid."
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
 msgstr ""
 
@@ -7053 +6891 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
-"Can't restrict the changeset query to a specific bounding box. The input is "
+"Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
@@ -7070 +6908 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
-"The current value isn't a valid user ID. Please enter an integer value > 0"
+"The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
-"<html>The  current value isn't a valid user name.<br>Please enter an non-"
+"<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
@@ -7115 +6953 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
 msgid "Basic"
 msgstr "Perus"
@@ -7196 +7034 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 #, java-format
 msgid "This will change {0} object."
@@ -7203 +7041 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7227 +7065 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 #, java-format
 msgid "This will change up to {0} object."
@@ -7234 +7072 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:564
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 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:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 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:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
 msgid "Download all child relations (recursively)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
 msgid "Download selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:449
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:40
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:47
@@ -7345 +7183 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
-msgid "Conflicts in data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
-#, java-format
-msgid ""
-"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
+msgid "Conflict in data"
+msgid_plural "Conflicts in data"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
 "loaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:354
 msgid "Relation is deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:522
 #, java-format
 msgid "Downloading relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:110
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:110
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7382 +7223 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 msgid "Apply Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 msgid "Enter a role and apply it to the selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -7419 +7260 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 #, java-format
 msgid ""
@@ -7436 +7277 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
 #, java-format
 msgid ""
@@ -7448 +7289 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -7464 +7305 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -7470 +7311 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
 #, java-format
 msgid ""
@@ -7492 +7333 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
 msgid "Sort the relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
-msgid ""
-"<html>This relation has been changed outside of the editor.<br>You can't "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You cannot "
 "apply your changes and continue editing.<br><br>Do you want to create a "
 "conflict and close the editor?</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
-msgid "Conflict in data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
 #, java-format
 msgid ""
@@ -7586 +7423 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the current updates"
 msgstr "Tee muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid "Apply the updates and close the dialog"
 msgstr "Tee muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Cancel the updates and close the dialog"
 msgstr "Peruuta muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
-#, java-format
-msgid ""
-"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-"deleting the roles of these primitives.<br>Do you really want to apply the "
-"new role?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307
+#, java-format
+msgid "You are setting an empty role on {0} primitive."
+msgid_plural "You are setting an empty role on {0} primitives."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+msgid "This is equal to deleting the roles of these primitives."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#, fuzzy
+msgid "Do you really want to apply the new role?"
+msgstr "Sallitaanko tämä?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
-msgid "No, don't apply"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
+msgid "No, do not apply"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -7673 +7518 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:187
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Tuonnin aikana oli {0} konfliktia."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:195
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -7703 +7548 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 msgid "Apply Changes"
 msgstr "Toteuta muutokset"
@@ -7727 +7572 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid "Warning: ignoring exception because task was cancelled. Exception was: "
+#, java-format
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -7825 +7672 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
 #, java-format
-msgid "The string ''{0}'' isn''t a valid double value."
+msgid "The string ''{0}'' is not a valid double value."
 msgstr ""
 
@@ -7968 +7815 @@
 #. <space />
 #. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
@@ -7984 +7827 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2337
-#: build/trans_presets.java:2379 build/trans_presets.java:2405
-#: build/trans_presets.java:2947 build/trans_presets.java:2957
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:379 build/trans_presets.java:661
+#: build/trans_presets.java:1009 build/trans_presets.java:1267
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2266 build/trans_presets.java:2808
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "Type"
 msgstr "Tyyppi"
 
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
+#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:58
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:139
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:785
-#: build/trans_presets.java:800 build/trans_presets.java:1344
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
 msgid "unknown"
 msgstr "tuntematon"
@@ -8139 +7975 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-msgid "Warning: bad location in HTML document. Exception was: "
+#, java-format
+msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr ""
 
@@ -8181 +8018 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306
 #, java-format
 msgid ""
@@ -8192 +8029 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
 #, java-format
 msgid ""
@@ -8198 +8035 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
 #, java-format
 msgid ""
@@ -8209 +8046 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
-#, java-format
-msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
@@ -8277 +8099 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
 msgstr "Muutoskokoelma"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
 #, java-format
 msgid ""
@@ -8287 +8109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #, java-format
 msgid ""
@@ -8343 +8165 @@
 #, java-format
 msgid ""
-"Failed to update primitive with id {0} because current edit layer doesn't "
+"Failed to update primitive with id {0} because current edit layer does not "
 "include such a primitive"
 msgstr ""
@@ -8408 +8230 @@
 #, java-format
 msgid ""
-"<html>Uploading <strong>failed</strong> because you''ve been "
+"<html>Uploading <strong>failed</strong> because you have been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
 "again with a new or an existing open changeset.</html>"
@@ -8575 +8397 @@
 #, java-format
 msgid ""
-"<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
+"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
+"and a valid password."
 msgstr ""
 
@@ -8594 +8416 @@
 #, java-format
 msgid ""
-"<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
+"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
 msgid ""
-"<html>Warning: depending on the authentication method the proxy server uses "
-"the password may be transferred unencrypted.</html>"
+"Warning: depending on the authentication method the proxy server uses the "
+"password may be transferred unencrypted."
 msgstr ""
 
@@ -8618 +8440 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
 msgid ""
-"<html>Could not retrieve the list of your open changesets because<br>JOSM "
-"doesn't know your identity.<br>You've either chosen to work anonymously or "
-"you are not entitled<br>to know the identity of the user on whose behalf you "
-"are working.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:69
+"Could not retrieve the list of your open changesets because<br>JOSM does not "
+"know your identity.<br>You have either chosen to work anonymously or you are "
+"not entitled<br>to know the identity of the user on whose behalf you are "
+"working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:122
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:121
 #, java-format
 msgid ""
@@ -8755 +8577 @@
 #, java-format
 msgid ""
-"<html>{0} layer needs saving but has an associated file<br>which can't be "
+"<html>{0} layer needs saving but has an associated file<br>which cannot be "
 "written.<br>Either select another file for this layer or discard the changes."
 "<br>Layer with a non-writable file:</html>"
 msgid_plural ""
-"<html>{0} layers need saving but have associated files<br>which can't be "
+"<html>{0} layers need saving but have associated files<br>which cannot be "
 "written.<br>Either select another file for each of them or discard the "
 "changes.<br>Layers with non-writable files:</html>"
@@ -8811 +8633 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has failed.</html>"
-msgstr ""
+msgid_plural ""
+"<html>Upload and/or save operations of {0} layers with modifications<br>were "
+"cancelled or have failed.</html>"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8838 +8665 @@
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
 #. item "Highways/Streets/Service" check "Embankment"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
@@ -8844 +8672 @@
 #. item "Highways/Streets/Tunnel" text "Name"
 #. item "Ways/Construction" check "Embankment"
-#. item "Ways/Bridleway" check "Embankment"
-#. item "Ways/Pedestrian" check "Embankment"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
-#. item "Ways/Path" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
 #. item "Water/Water/Stream" text "Name"
@@ -8859 +8687 @@
 #: build/trans_presets.java:192 build/trans_presets.java:212
 #: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:290
-#: build/trans_presets.java:323 build/trans_presets.java:369
-#: build/trans_presets.java:384 build/trans_presets.java:399
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:462 build/trans_presets.java:482
-#: build/trans_presets.java:501 build/trans_presets.java:520
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:645
-#: build/trans_presets.java:676 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1099 build/trans_presets.java:1319
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:387 build/trans_presets.java:402
+#: build/trans_presets.java:417 build/trans_presets.java:439
+#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:511 build/trans_presets.java:532
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:934 build/trans_presets.java:942
+#: build/trans_presets.java:950 build/trans_presets.java:960
+#: build/trans_presets.java:1180
 msgid "Layer"
 msgstr "Taso"
@@ -8973 +8800 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
 msgid ""
@@ -8980 +8807 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing primitives to upload ..."
 msgstr "Lähetettävät objektit..."
@@ -9144 +8971 @@
 msgstr "Lähetetään {0} objektia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9213 +9040 @@
 #, java-format
 msgid ""
-"<html>Can''t upload {0} objects in one request because the<br>max. changeset "
+"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
@@ -9297 +9124 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "gps-piste"
@@ -9363 +9189 @@
 msgid ""
 "<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points don''t include a timestamp we can''t correlate "
+"<br>Because its way points do not include a timestamp we cannot correlate "
 "them with audio data.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
 msgid "Import not possible"
 msgstr ""
@@ -9381 +9207 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 #, java-format
 msgid ""
 "<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points don''t include a timestamp we can''t correlate "
+"<br>Because its way points do not include a timestamp we cannot correlate "
 "them with images.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9399 +9225 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9405 +9231 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
 #, java-format
 msgid "{0} track"
@@ -9413 +9239 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3055
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:436
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
 #, java-format
 msgid "{0} route, "
@@ -9438 +9264 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} waypoint"
@@ -9445 +9271 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9458 +9284 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
@@ -9472 +9298 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:959
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
 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:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:952
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
 #, java-format
 msgid ""
@@ -9503 +9329 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1063
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
 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:1232
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9513 +9339 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9653 +9479 @@
 msgstr[1] "{0} pistettä"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#, fuzzy
+msgid "GPS point"
+msgstr "GPS-pisteet"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -9694 +9525 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
-msgid "I'm in the timezone of: "
+msgid "I am in the timezone of: "
 msgstr ""
 
@@ -9703 +9534 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
-msgid "Open an other photo"
+msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
@@ -9779 +9610 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
 #, java-format
-msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:669
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
+msgid_plural ""
+"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:864
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9829 +9663 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9835 +9669 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:928
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
-msgid "The selected photos don't contain time information."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
-msgid "Photos don't contain time information"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:977
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#, fuzzy
+msgid "The selected photos do not contain time information."
+msgstr "Valittu polku ei sisällä valittua pistettä."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgid "Photos do not contain time information"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+msgid ""
+"The selected GPX track does not contain timestamps. Please select another "
+"one."
 msgstr ""
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
 #, java-format
 msgid ""
@@ -9876 +9712 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1317
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
 #, java-format
 msgid ""
@@ -9935 +9771 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-msgid "image"
-msgid_plural "images"
-msgstr[0] "kuva"
-msgstr[1] "kuvat"
+#, fuzzy, java-format
+msgid "{0} image loaded."
+msgid_plural "{0} images loaded."
+msgstr[0] "Ei dataa ladattuna."
+msgstr[1] "Ei dataa ladattuna."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
+#, fuzzy, java-format
+msgid "{0} was found to be GPS tagged."
+msgid_plural "{0} were found to be GPS tagged."
+msgstr[0] "{0} kuvasta löytyi gps-sijaintitiedot."
+msgstr[1] "{0} kuvasta löytyi gps-sijaintitiedot."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
@@ -10146 +9985 @@
 #, java-format
 msgid ""
-"Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}"
+"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -10152 +9991 @@
 #, java-format
 msgid ""
-"Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}"
+"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
 msgid "Access Token Key:"
@@ -10162 +10001 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
 msgid "Access Token Secret:"
@@ -10198 +10037 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
 msgid "Authorise URL:"
 msgstr ""
@@ -10220 +10059 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
 msgid ""
 "<html>Run a fully automatic procedure to get an access token from the OSM "
@@ -10240 +10079 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
 msgid ""
 "<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -10249 +10088 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
 msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
@@ -10255 +10094 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:112
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
 msgid "Granted rights"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
 msgid "Advanced OAuth properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
 msgid "Accept Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
-#, java-format
-msgid ""
-"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
+#, java-format
+msgid ""
+"<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
 msgid "Authorise now"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
 msgid "Click to redirect you to the authorisation form on the JOSM web site"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+msgid "Back"
+msgstr "Takaisin"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366
 msgid "Run the automatic authorisation steps again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
 msgid "Test Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
@@ -10312 +10156 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
-msgid "The user name can't be empty. Please enter your OSM user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:430
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
-msgid "The password can't be empty. Please enter your OSM password"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432
+msgid "The password cannot be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442
 msgid "Authorise JOSM to access the OSM API"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10338 +10182 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
 msgid "OAuth authorisation failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
+#, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"OSM server failed because JOSM was not able to build<br>a valid login URL "
 "from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check your "
 "advanced setting and try again.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
 #, java-format
 msgid ""
@@ -10360 +10205 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
+#, java-format
+msgid ""
+"Please enter an OAuth Access Token which is authorised to access the OSM "
+"server ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
+msgid "Advanced OAuth parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
 #, java-format
 msgid ""
@@ -10368 +10239 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
-msgid "Save Access Token to preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
-msgid "Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
-msgid "Advanced OAuth parameters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
-msgid "Enter the OAuth Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
-msgid "Enter advanced OAuth properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
@@ -10407 +10258 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
 msgid "Please select an authorisation procedure: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
 #, java-format
 msgid "Get an Access Token for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
 msgid "Close the dialog and cancel authorisation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:105
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:129
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:162
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
-#, java-format
-msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:299
+#, java-format
+msgid "OSM website did not return a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:350
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
 #, java-format
 msgid "Failed to authorise OAuth request  ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
 #, java-format
 msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
 #, java-format
 msgid "Authorising request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -10549 +10400 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
 #, java-format
 msgid ""
@@ -10566 +10417 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
 msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
-#, java-format
-msgid ""
-"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
-"launching an authorisation page in an external browser. Please login with "
-"your OSM username and password and follow the instructions to authorise the "
-"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
+#, java-format
+msgid ""
+"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
+"authorisation page in an external browser. Please login with your OSM "
+"username and password and follow the instructions to authorise the Request "
+"Token. Then switch back to this dialog and click on <strong>{0}</"
 "strong><br><br>If launching the external browser fails you can copy the "
 "following authorise URL and paste it into the address field of your browser."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
-msgid ""
-"<html><body>JOSM has successfully retrieved an Access Token. You can now "
-"accept this token. JOSM will used it the future for authentication and "
-"authorisation at the OSM server.<br><br>The access token is: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
+msgid ""
+"<html>JOSM has successfully retrieved an Access Token. You can now accept "
+"this token. JOSM will use it in the future for authentication and "
+"authorisation to the OSM server.<br><br>The access token is: </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
 msgstr ""
@@ -10632 +10484 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
 #, java-format
-msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
 
@@ -10639 +10491 @@
 msgid ""
 "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
-"at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with id "
+"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
 "''{3}''.</html>"
 msgstr ""
@@ -10666 +10518 @@
 #, java-format
 msgid ""
-"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
 "test to retrieve the user details for this token failed, though."
 "<br>Depending on what rights are granted to this token you may nevertheless "
@@ -10680 +10532 @@
 #, java-format
 msgid ""
-"<html>Failed to retrieve information about the current userfrom the OSM "
+"<html>Failed to retrieve information about the current user from the OSM "
 "server ''{0}''.<br>This is probably not a problem caused by the tested "
 "Access Token, but<br>rather a problem with the server configuration. "
@@ -10696 +10548 @@
 msgid ""
 "<html>The test failed because the server responded with an internal error."
-"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
 "</html>"
 msgstr ""
@@ -10733 +10585 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "Please select the row to edit."
 msgstr "Ole hyvä ja valitse muokattava rivi."
@@ -10745 +10597 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10955 +10807 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1249
 msgid "Car"
 msgstr "Auto"
@@ -10975 +10827 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:336 build/trans_presets.java:662
-#: build/trans_presets.java:869 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:961 build/trans_presets.java:974
-#: build/trans_presets.java:986 build/trans_presets.java:998
-#: build/trans_presets.java:1010 build/trans_presets.java:1022
-#: build/trans_presets.java:1032 build/trans_presets.java:1041
-#: build/trans_presets.java:1050 build/trans_presets.java:1444
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:354 build/trans_presets.java:487
+#: build/trans_presets.java:730 build/trans_presets.java:749
+#: build/trans_presets.java:763 build/trans_presets.java:785
+#: build/trans_presets.java:822 build/trans_presets.java:835
+#: build/trans_presets.java:847 build/trans_presets.java:859
+#: build/trans_presets.java:871 build/trans_presets.java:883
+#: build/trans_presets.java:893 build/trans_presets.java:902
+#: build/trans_presets.java:911 build/trans_presets.java:1305
+#: build/trans_presets.java:1371
 msgid "Bicycle"
 msgstr "Polkupyörä"
 
-#. item "Ways/Path" label "Type"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11015 +10866 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:337 build/trans_presets.java:661
-#: build/trans_presets.java:868 build/trans_presets.java:887
-#: build/trans_presets.java:901 build/trans_presets.java:923
-#: build/trans_presets.java:960 build/trans_presets.java:973
-#: build/trans_presets.java:985 build/trans_presets.java:997
-#: build/trans_presets.java:1009 build/trans_presets.java:1021
-#: build/trans_presets.java:1031 build/trans_presets.java:1040
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:355 build/trans_presets.java:486
+#: build/trans_presets.java:729 build/trans_presets.java:748
+#: build/trans_presets.java:762 build/trans_presets.java:784
+#: build/trans_presets.java:821 build/trans_presets.java:834
+#: build/trans_presets.java:846 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:892 build/trans_presets.java:901
+#: build/trans_presets.java:910
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -11073 +10924 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
-"Maximum length (in meters) to draw lines for local files. Set to '-1' to "
+"Maximum length (in meters) to draw lines for local files. 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11083 +10936 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
-"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 "Enimmäispituus (metreissä) pisteiden välisille viivoille. Arvolla -1 "
@@ -11111 +10964 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
-"Don't draw arrows if they are not at least this distance away from the last "
+"Do not 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ä."
@@ -11253 +11106 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
 #, java-format
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
@@ -11260 +11113 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
 #, java-format
 msgid "Downloading the following plugin has <strong>failed</strong>:"
@@ -11268 +11121 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:166
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
 msgid "Please select an entry."
 msgstr "Valitse kohta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:228
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234
 msgid "Configure Plugin Sites"
 msgstr "Muokkaa liitännäissivustoja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:281
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:310
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:328
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:340
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:540
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Update plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:363
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:364
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
 msgstr ""
@@ -11362 +11216 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#, fuzzy
 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>"
+"correspond to a real key on your keyboard. So if your keyboard has no "
+"''Copy'' key (PC keyboard do not 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 "
@@ -11403 +11259 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
-"</p>"
+"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
+"encountered.</p>"
 msgstr ""
 
@@ -11739 +11595 @@
 #, java-format
 msgid ""
-"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
 msgstr ""
@@ -11779 +11635 @@
 #, java-format
 msgid ""
-"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
-"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
+"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
@@ -11858 +11714 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
 msgid ""
-"You don't have an Access Token yet to access the OSM server using OAuth. "
+"You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorise first."
 msgstr ""
@@ -11918 +11774 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
-msgid "The current value isn't a valid URL"
+msgid "The current value is not a valid URL"
 msgstr ""
 
@@ -11970 +11826 @@
 msgid ""
 "Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to 'No proxy'"
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
 
@@ -12095 +11951 @@
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
@@ -12108 +11964 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-msgid ""
-"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}"
+#, java-format
+msgid ""
+"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -12126 +11983 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:126
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:128
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:132
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133
 #, java-format
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
 #, java-format
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:298
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:300
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:307
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:313
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:318
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:324
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:329
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:340
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:347
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:361
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:365
-msgid ""
-"Can't create a changeset query including both the query parameters 'uid' and "
-"'display_name'"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:390
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Cannot create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
@@ -12221 +12078 @@
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property 'java.net.useSystemProxies' was missing at startup "
-"time. Won't use a proxy."
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time.  Will not use a proxy."
 msgstr ""
 
@@ -12239 +12096 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
 #, java-format
 msgid "Could not import ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
 msgid "Could not import files."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:59
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
 #, java-format
 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>"
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:73
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
 #, java-format
 msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -12266 +12123 @@
 "GPL:n alaisia jälkiä."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26
 msgid "GPX Files"
 msgstr "GPX-tiedostot"
@@ -12324 +12181 @@
 msgstr "Valitse ennaltamääritetty lisenssi"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12333 +12190 @@
 msgstr "Merkinnät: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:67
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
 #, java-format
 msgid ""
@@ -12340 +12197 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:78
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:81
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -12359 +12216 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "folder"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
+#, fuzzy
+msgid "Looking for image files"
+msgstr "Etsitään rantaviivaa..."
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
 msgstr ""
@@ -12378 +12240 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -12384 +12246 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
@@ -12438 +12300 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183 -tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Coordinates imported: "
 msgstr "Tuodut koordinaatit: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Malformed sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
 msgid "Checksum errors: "
 msgstr "Tarkistussummavrihe: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
 msgid "Unknown sentences: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "Zero coordinates: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
 msgid "NMEA import success"
 msgstr "NMEA-tuonti onnistui"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
 msgid "NMEA import failure!"
 msgstr "NMEA-tuonti epäonnistui"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
 #, java-format
 msgid ""
@@ -12487 +12349 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:256
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319
 #, java-format
@@ -12498 +12360 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:277
 #, java-format
 msgid ""
@@ -12513 +12375 @@
 msgstr "Muutoskokoelma {0} avattiin onnistuneesti"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:661
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
 msgid "Updating changeset..."
 msgstr "Muutoskokoelmaa päivitetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Muutoskokoelmaa {0} päivitetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Muutoskokoelmaa suljetaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "No changeset present for diff upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
 msgid "Preparing upload request..."
 msgstr ""
 
-#. Upload to the server
-#.
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} objects..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
+#, fuzzy, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Lähetetään {0} objektia..."
+msgstr[1] "Lähetetään {0} objektia..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:456
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:537
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:633
 msgid "Current changeset is null. Cannot upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -12592 +12454 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
 msgid "Invalid bz2 file."
 msgstr ""
@@ -12615 +12477 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:164
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -12683 +12545 @@
 msgid ""
 "Illegal document structure. Found node, way, or relation outside of "
-"'create', 'modify', or 'delete'."
+"''create'', ''modify'', or ''delete''."
 msgstr ""
 
@@ -12697 +12559 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:145
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:151
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:82
 #, java-format
 msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:116
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #, java-format
 msgid "Unsupported version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:177
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:216
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:217
 msgid "Parsing list of changesets..."
 msgstr "Muutoskokoelmalistaa käsitellään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
-msgid ""
-"Failed to add an OAuth authentication header. There is currently no OAuth "
-"Access Token configured."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:125
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136
 #, java-format
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
@@ -12764 +12614 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
 msgstr "OSM-palvelintiedostot"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45
-#, java-format
-msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #, java-format
 msgid ""
@@ -12786 +12631 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
@@ -12792 +12637 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
 msgstr ""
@@ -12800 +12645 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112
 #, java-format
 msgid ""
@@ -12812 +12657 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #, java-format
 msgid ""
@@ -12819 +12664 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292
 #, java-format
 msgid ""
@@ -12858 +12703 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
 msgid "Illegal object with ID=0."
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
 #, java-format
 msgid ""
@@ -12880 +12725 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #, java-format
 msgid ""
@@ -12891 +12736 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -12902 +12747 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430
 #, java-format
 msgid ""
@@ -12911 +12756 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470
 #, java-format
 msgid ""
@@ -12933 +12778 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -12940 +12785 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
 #, java-format
 msgid ""
@@ -12946 +12791 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
 #, java-format
 msgid ""
@@ -12953 +12798 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
-#, java-format
-msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
 msgid "Downloading referring relations ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
 msgstr "Luetaan muutoskokoelmia..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
 msgid "Downloading changesets ..."
 msgstr "Ladataan muutoskokoelmia..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
 #, java-format
 msgid "Reading changeset {0} ..."
 msgstr "Muutoskokoelmaa {0} luetaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
 #, java-format
 msgid "Downloading changeset {0} ..."
 msgstr "Muutoskokoelmaa {0} ladataan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
 #, java-format
 msgid "Downloading {0} changeset ..."
@@ -13007 +12847 @@
 msgstr[1] "Ladataan {0} muutoskokoelmaa..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
 msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173
-#, java-format
-msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:184
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
 #, java-format
 msgid "Downloading content for changeset {0} ..."
 msgstr "Ladataan muutoskokoelman {0} sisältöä..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
 msgstr ""
@@ -13035 +12865 @@
 msgstr "Yhdistetään palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
-#, java-format
-msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
@@ -13048 +12872 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
 msgid ""
-"Couldn't connect to the OSM server. Please check your internet connection."
+"Could not connect to the OSM server. Please check your internet connection."
 msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
 
@@ -13075 +12899 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään pistettä ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään polkua ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:119
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:121
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:143
 msgid "Starting to upload in chunks..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
-#, java-format
-msgid "({0}/{1}) Uploading {2} objects..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
+#, fuzzy, java-format
+msgid "({0}/{1}) Uploading {2} object..."
+msgid_plural "({0}/{1}) Uploading {2} objects..."
+msgstr[0] "Lähetetään {0} objektia..."
+msgstr[1] "Lähetetään {0} objektia..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
 msgstr "Lähetetään dataa..."
@@ -13140 +12966 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
+"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
 "Skipping download."
 msgstr ""
@@ -13147 +12973 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t a "
+"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
 msgstr ""
@@ -13167 +12993 @@
 msgstr "Tapahtui virhe liitännäisessä {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 msgid "The following plugin is no longer necessary and has been deactivated:"
 msgid_plural ""
@@ -13174 +13000 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:133
-#, java-format
-msgid ""
-"<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be disabled."
-"<br>Delete from preferences?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
-msgid ""
-"<html>You updated your JOSM software.<br>To prevent problems the plugins "
-"should be updated as well.<br><br>Update plugins now?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:170
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#, java-format
+msgid ""
+"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
+"longer developed and very likely will produce errors.<br>It should be "
+"disabled.<br>Delete from preferences?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
+msgid ""
+"You updated your JOSM software.<br>To prevent problems the plugins should be "
+"updated as well.<br><br>Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
+msgid "Click to update the activated plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
 msgid "Skip update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:202
-#, java-format
-msgid "A required plugin for plugin {0} was not found. The required plugin is:"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+msgid "Click to skip updating the activated plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
+#, fuzzy, java-format
+msgid ""
+"Plugin {0} requires a plugin which was not found. The missing plugin is:"
 msgid_plural ""
-"{1} required plugins for plugin {0} were not found. The required plugins are:"
+"Plugin {0} requires {1} plugins which were not found. The missing plugins "
+"are:"
 msgstr[0] ""
+"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, java-format
-msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
+#, java-format
+msgid ""
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 #, java-format
 msgid "loading plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:330
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:345
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13239 +13079 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:447
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13245 +13085 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:472
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:478
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:480
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
 msgid "Removing umaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:504
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13263 +13103 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514
-msgid ""
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
+msgid ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"it manually."
+msgid_plural ""
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:519
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:574
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:688
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
 msgid "Disable plugin"
 msgstr "Poista liitännäinen käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
+#, java-format
+msgid "Click to delete the plugin ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:637
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
+#, java-format
+msgid "Click to keep the plugin ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
 #, java-format
 msgid ""
@@ -13297 +13152 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:643
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
 #, java-format
 msgid ""
@@ -13304 +13159 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:693
-msgid "<html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:694
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
+#, java-format
+msgid "Click to disable the plugin ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
 #, java-format
 msgid ""
@@ -13314 +13170 @@
 msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:697
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13325 +13181 @@
 "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:702
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
 msgid "Should the plugin be disabled?"
 msgstr "Pitäisikö liitännäinen poistaa käytöstä?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13337 +13193 @@
 "liitännäisen käytöstä."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:720
-msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179
 msgid "no description available"
 msgstr "kuvausta ei ole saatavilla"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
+msgid "Do not check and ask again at startup (remembers choice)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
 #, java-format
-msgid "The plugin file ''{0}'' doesn't include a Manifest."
+msgid "The plugin file ''{0}'' does not include a Manifest."
 msgstr ""
 
@@ -13437 +13293 @@
 msgstr "Virhe soitettaessa ääntä"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#. Then ask for submitting a bug report, for exceptions thrown from a plugin too
+#.
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Report Bug"
 msgstr "Ilmoita ohjelmavirheestä"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57
-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."
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
 msgstr ""
 "Tapahtui odottamaton poikkeus.\n"
@@ -13457 +13315 @@
 "JOSM:n versiota, ilmoita ohjelmavirheestä."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid "Unexpected Exception"
 msgstr "Odottamaton poikkeus"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug reportmake sure "
@@ -13467 +13325 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:107
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "You should also update your plugins. If neither of those help pleasefile a "
@@ -13473 +13331 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid ""
 "There the error information provided below should already befilled in for "
@@ -13480 +13338 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115
-msgid ""
-"Alternatively, if that doesn't work you can manually fill in the "
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
 "informationbelow at this URL:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:136
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Teksti on jo kopioitu leikepöydälle)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:22
-#, java-format
-msgid "Expected unique id > 0 for primitive id, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:27
-#, java-format
-msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:47
-#, java-format
-msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
 #, java-format
 msgid ""
@@ -13516 +13359 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#, java-format
+msgid ""
+"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
+"OAuth to authenticate but currently there is no<br>OAuth Access Token "
+"configured.<br>Please open the Preferences Dialog and generate or enter an "
+"Access Token.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77
 #, java-format
 msgid ""
@@ -13524 +13376 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:104
 #, java-format
 msgid ""
@@ -13532 +13384 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
 #, java-format
 msgid ""
@@ -13540 +13392 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122
 #, java-format
 msgid ""
@@ -13548 +13400 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
 #, java-format
 msgid ""
@@ -13557 +13409 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid ""
@@ -13564 +13416 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
 #, java-format
 msgid ""
@@ -13571 +13423 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:183
 #, java-format
 msgid ""
@@ -13578 +13430 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:189
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 #, java-format
 msgid ""
@@ -13589 +13441 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
 "security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+"applet and because you did not load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
 #, java-format
 msgid ""
@@ -13604 +13456 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:277
 #, java-format
 msgid ""
@@ -13611 +13463 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid ""
@@ -13618 +13470 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:310
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13630 +13482 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
-#, java-format
-msgid ""
-"The OSM server ''{0}'' doesn''t know about an object<br>you tried to read, "
-"update, or delete. Either the respective object<br>doesn''t exist on the "
-"server or you''re using an invalid URL to access<br>it. Please carefully "
-"check the servers address ''{0}'' for typos."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#, java-format
+msgid ""
+"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>does not exist on the "
+"server or you are using an invalid URL to access<br>it. Please carefully "
+"check the server''s address ''{0}'' for typos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
 "preferences and your internet connection.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
 #, java-format
 msgid ""
@@ -13744 +13596 @@
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
 msgstr ""
@@ -13752 +13604 @@
 msgid ""
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
-"{2}. Can''t restore window geometry from preferences."
+"{2}. Cannot restore window geometry from preferences."
 msgstr ""
 
@@ -13759 +13611 @@
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
-"{2}. Can''t restore window geometry from preferences."
+"{2}. Cannot restore window geometry from preferences."
 msgstr ""
 
@@ -13765 +13617 @@
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
 msgstr ""
@@ -13908 +13760 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2146
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -14485 +14337 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "Location"
 msgstr ""
@@ -14640 +14492 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -15064 +14916 @@
 #.
 #. <rule>
+#. <condition k="waterway" v="ditch"/>
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="waterway" v="drain"/>
 #. color marsh
@@ -15082 +14941 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2337 build/trans_style.java:993
+#: build/trans_presets.java:2198 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
-#: build/trans_style.java:3461 build/trans_style.java:3469
+#: build/trans_style.java:1033 build/trans_style.java:3492
+#: build/trans_style.java:3500
 msgid "water"
 msgstr "vesi"
@@ -16097 +15957 @@
 msgstr "Ei virheitä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
 msgstr "Ruudukko"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
 #, java-format
 msgid ""
@@ -16187 +16046 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Tarkistus"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 msgid "Performs the data validation"
 msgstr "Suorittaa datantarkistuksen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:120
 msgid "Validating"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:161
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:170
 msgid "Updating ignored errors ..."
 msgstr ""
@@ -16272 +16131 @@
 msgid "Replace \"{0}\" by \"{1}\" for"
 msgstr "Korvaa \"{0}\" → \"{1}\" kohteelle"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "objekti"
+msgstr[1] "objektit"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
@@ -16320 +16186 @@
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+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?"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
 msgid "Confirmation"
@@ -16357 +16233 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3017
 msgid "Multipolygon"
 msgstr ""
@@ -16488 +16364 @@
 msgstr "Etsii virheellisiä avain/arvo-pareja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Epäkelpo oikeinkirjoituksen tarkistussääntö: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307
 #, java-format
 msgid ""
@@ -16507 +16383 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:428
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
 msgid "Illegal tag/value combinations"
 msgstr "Virheelliset avain/arvo-parit"
@@ -16515 +16391 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:453
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
 msgid "Painting problem"
 msgstr "Piirto-ongelma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:463
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Avain \"{0}\" virheellinen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
 msgid "Tags with empty values"
 msgstr "Tyhjät arvot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
 msgid "Invalid property key"
 msgstr "Epäkelpo avain"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid "Invalid white space in property key"
 msgstr "Virheellinen välilyönti avaimessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
 msgid "Property values start or end with white space"
 msgstr "Arvossa välilyönti alussa tai lopussa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Check property keys."
 msgstr "Tarkista ominaisuuksien avaimet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:632
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16600 +16476 @@
 "php/User:JLS/speller )"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Add a new source to the list."
 msgstr "Lisää tiedosto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid "Delete the selected source from the list."
 msgstr "Poista valittu lähde listasta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Data sources"
 msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check property values."
 msgstr "Tarkista ominaisuuksien arvot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for FIXMES."
 msgstr "Etsi FIXME:t"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Etsii solmut ja polut joissa arvona FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Check for paint notes."
 msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Check if map painting found data errors."
 msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default data file."
 msgstr "Käytä oletussääntötiedostoa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default data file (recommended)."
 msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use default spellcheck file."
 msgstr "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:847
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:968
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:994
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16799 +16675 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4261
+#: build/trans_style.java:4292
 msgid "building"
 msgstr "rakennus"
@@ -16811 +16687 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4268
+#: build/trans_style.java:4299
 msgid "area"
 msgstr "alue"
@@ -17532 +17408 @@
 #. <!--
 #. Pics have been derived from
-#. http://commons.wikipedia.org (german street sign SVGs)
+#. http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs)
 #. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
 #. http://www.kde.org
@@ -17637 +17513 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1560 build/trans_presets.java:2389
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:1421 build/trans_presets.java:2250
+#: build/trans_presets.java:3053
 msgid "Reference"
 msgstr "Numero"
@@ -17653 +17529 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:370
+#: build/trans_presets.java:193 build/trans_presets.java:388
 msgid "Lanes"
 msgstr "Kaistat"
@@ -17668 +17544 @@
 #. item "Highways/Streets/Bridge" combo "Layer"
 #. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Path" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:292
-#: build/trans_presets.java:325 build/trans_presets.java:346
-#: build/trans_presets.java:385 build/trans_presets.java:400
-#: build/trans_presets.java:424 build/trans_presets.java:443
-#: build/trans_presets.java:464 build/trans_presets.java:484
-#: build/trans_presets.java:522 build/trans_presets.java:678
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:236 build/trans_presets.java:310
+#: build/trans_presets.java:343 build/trans_presets.java:364
+#: build/trans_presets.java:403 build/trans_presets.java:418
+#: build/trans_presets.java:442 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:597
+#: build/trans_presets.java:617 build/trans_presets.java:1182
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -17695 +17571 @@
 #. item "Highways/Streets/Living Street" text "Name"
 #. <optional>
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. <optional>
 #. item "Highways/Streets/Service" text "Name"
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
@@ -17705 +17583 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. item "Ways/Construction" text "Name"
-#. item "Ways/Bridleway" text "Name"
-#. item "Ways/Cycleway" text "Name"
-#. item "Ways/Footway" text "Name"
-#. item "Ways/Pedestrian" text "Name"
-#. <optional>
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
 #. item "Ways/Steps" text "Name"
-#. item "Ways/Path" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -17718 +17597 @@
 #: build/trans_presets.java:195 build/trans_presets.java:214
 #: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:285
-#: build/trans_presets.java:305 build/trans_presets.java:318
-#: build/trans_presets.java:332 build/trans_presets.java:364
-#: build/trans_presets.java:416 build/trans_presets.java:436
-#: build/trans_presets.java:456 build/trans_presets.java:476
-#: build/trans_presets.java:496 build/trans_presets.java:515
-#: build/trans_presets.java:671 build/trans_presets.java:1314
+#: build/trans_presets.java:266 build/trans_presets.java:284
+#: build/trans_presets.java:303 build/trans_presets.java:323
+#: build/trans_presets.java:336 build/trans_presets.java:350
+#: build/trans_presets.java:382 build/trans_presets.java:434
+#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:506 build/trans_presets.java:526
+#: build/trans_presets.java:549 build/trans_presets.java:571
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:1175
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -17739 +17620 @@
 #. item "Highways/Streets/Residential" check "Oneway"
 #. item "Highways/Streets/Living Street" check "Oneway"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
@@ -17745 +17627 @@
 #. </optional>
 #. item "Ways/Construction" check "Oneway"
-#. item "Ways/Bridleway" check "Oneway"
-#. item "Ways/Cycleway" check "Oneway"
-#. item "Ways/Footway" check "Oneway"
-#. item "Ways/Pedestrian" check "Oneway"
+#. item "Ways/Track" text "Name"
+#. item "Ways/Path" text "Name"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Track Grade 1" text "Name"
-#. item "Ways/Track Grade 2" text "Name"
-#. item "Ways/Track Grade 3" text "Name"
-#. item "Ways/Track Grade 4" text "Name"
-#. item "Ways/Track Grade 5" text "Name"
-#. item "Ways/Path" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
 #. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
@@ -17769 +17647 @@
 #: build/trans_presets.java:196 build/trans_presets.java:215
 #: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:286
-#: build/trans_presets.java:319 build/trans_presets.java:365
-#: build/trans_presets.java:374 build/trans_presets.java:417
-#: build/trans_presets.java:437 build/trans_presets.java:457
-#: build/trans_presets.java:477 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:577
-#: build/trans_presets.java:598 build/trans_presets.java:619
-#: build/trans_presets.java:640 build/trans_presets.java:672
-#: build/trans_presets.java:1315 build/trans_surveyor.java:12
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:337
+#: build/trans_presets.java:383 build/trans_presets.java:392
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Silta"
@@ -17793 +17670 @@
 #. item "Highways/Streets/Residential" check "Bridge"
 #. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Pedestrian" check "Bridge"
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
@@ -17799 +17677 @@
 #. </optional>
 #. item "Ways/Construction" check "Bridge"
-#. item "Ways/Bridleway" check "Bridge"
-#. item "Ways/Cycleway" check "Bridge"
-#. item "Ways/Footway" check "Bridge"
-#. item "Ways/Pedestrian" check "Bridge"
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Ways/Dedicated Bridleway" check "Bridge"
+#. item "Ways/Dedicated Cycleway" check "Bridge"
+#. item "Ways/Segregated Foot- and Cycleway" check "Bridge"
+#. item "Ways/Combined Foot- and Cycleway" check "Bridge"
+#. item "Ways/Dedicated Footway" check "Bridge"
 #. item "Ways/Steps" check "Bridge"
-#. item "Ways/Track" check "Bridge"
-#. item "Ways/Track Grade 1" check "Bridge"
-#. item "Ways/Track Grade 2" check "Bridge"
-#. item "Ways/Track Grade 3" check "Bridge"
-#. item "Ways/Track Grade 4" check "Bridge"
-#. item "Ways/Track Grade 5" check "Bridge"
-#. item "Ways/Path" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
 #: build/trans_presets.java:84 build/trans_presets.java:101
@@ -17817 +17691 @@
 #: build/trans_presets.java:197 build/trans_presets.java:216
 #: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:287
-#: build/trans_presets.java:320 build/trans_presets.java:366
-#: build/trans_presets.java:390 build/trans_presets.java:418
-#: build/trans_presets.java:438 build/trans_presets.java:458
-#: build/trans_presets.java:478 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:536
-#: build/trans_presets.java:557 build/trans_presets.java:578
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:641 build/trans_presets.java:673
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:384 build/trans_presets.java:408
+#: build/trans_presets.java:436 build/trans_presets.java:455
+#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:528 build/trans_presets.java:551
+#: build/trans_presets.java:573 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:1177
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -17841 +17713 @@
 #. item "Highways/Streets/Residential" check "Tunnel"
 #. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Pedestrian" check "Tunnel"
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
 #. item "Ways/Construction" check "Tunnel"
-#. item "Ways/Bridleway" check "Tunnel"
-#. item "Ways/Cycleway" check "Tunnel"
-#. item "Ways/Footway" check "Tunnel"
-#. item "Ways/Pedestrian" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Ways/Dedicated Bridleway" check "Tunnel"
+#. item "Ways/Dedicated Cycleway" check "Tunnel"
+#. item "Ways/Segregated Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Combined Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Dedicated Footway" check "Tunnel"
 #. item "Ways/Steps" check "Tunnel"
-#. item "Ways/Track" check "Tunnel"
-#. item "Ways/Track Grade 1" check "Tunnel"
-#. item "Ways/Track Grade 2" check "Tunnel"
-#. item "Ways/Track Grade 3" check "Tunnel"
-#. item "Ways/Track Grade 4" check "Tunnel"
-#. item "Ways/Track Grade 5" check "Tunnel"
-#. item "Ways/Path" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
 #: build/trans_presets.java:85 build/trans_presets.java:102
@@ -17863 +17732 @@
 #: build/trans_presets.java:198 build/trans_presets.java:217
 #: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:288
-#: build/trans_presets.java:321 build/trans_presets.java:367
-#: build/trans_presets.java:419 build/trans_presets.java:439
-#: build/trans_presets.java:459 build/trans_presets.java:479
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:579 build/trans_presets.java:600
-#: build/trans_presets.java:621 build/trans_presets.java:642
-#: build/trans_presets.java:674 build/trans_presets.java:1317
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:385 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:509 build/trans_presets.java:529
+#: build/trans_presets.java:552 build/trans_presets.java:574
+#: build/trans_presets.java:592 build/trans_presets.java:613
+#: build/trans_presets.java:1178
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -17886 +17754 @@
 #. item "Highways/Streets/Residential" check "Cutting"
 #. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Pedestrian" check "Cutting"
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
 #. item "Ways/Construction" check "Cutting"
-#. item "Ways/Bridleway" check "Cutting"
-#. item "Ways/Cycleway" check "Cutting"
-#. item "Ways/Footway" check "Cutting"
-#. item "Ways/Pedestrian" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Ways/Dedicated Bridleway" check "Cutting"
+#. item "Ways/Dedicated Cycleway" check "Cutting"
+#. item "Ways/Segregated Foot- and Cycleway" check "Cutting"
+#. item "Ways/Combined Foot- and Cycleway" check "Cutting"
+#. item "Ways/Dedicated Footway" check "Cutting"
 #. item "Ways/Steps" check "Cutting"
-#. item "Ways/Track" check "Cutting"
-#. item "Ways/Track Grade 1" check "Cutting"
-#. item "Ways/Track Grade 2" check "Cutting"
-#. item "Ways/Track Grade 3" check "Cutting"
-#. item "Ways/Track Grade 4" check "Cutting"
-#. item "Ways/Track Grade 5" check "Cutting"
-#. item "Ways/Path" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
 #: build/trans_presets.java:86 build/trans_presets.java:103
@@ -17908 +17773 @@
 #: build/trans_presets.java:199 build/trans_presets.java:218
 #: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:289
-#: build/trans_presets.java:322 build/trans_presets.java:368
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:460 build/trans_presets.java:480
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:643
-#: build/trans_presets.java:675 build/trans_presets.java:1318
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:386 build/trans_presets.java:438
+#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:510 build/trans_presets.java:530
+#: build/trans_presets.java:553 build/trans_presets.java:575
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:1179
 msgid "Embankment"
 msgstr "Penger"
@@ -18054 +17918 @@
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
 #. item "Ways/Construction" text "Max. speed (km/h)"
-#. item "Ways/Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Cycleway" text "Max. speed (km/h)"
-#. item "Ways/Footway" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
 #. item "Ways/Steps" text "Max. speed (km/h)"
-#. item "Ways/Path" text "Max. speed (km/h)"
-#. item "Ways/Hiking" text "Name"
-#. item "Ways/Mountain Hiking" text "Name"
-#. item "Ways/Demanding Mountain Hiking" text "Name"
-#. item "Ways/Alpine Hiking" text "Name"
-#. item "Ways/Demanding Alpine Hiking" text "Name"
-#. item "Ways/Difficult Alpine Hiking" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
 #: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:293
-#: build/trans_presets.java:326 build/trans_presets.java:371
-#: build/trans_presets.java:387 build/trans_presets.java:401
-#: build/trans_presets.java:425 build/trans_presets.java:444
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:503 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:649
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:757 build/trans_presets.java:1322
-#: build/trans_presets.java:1498 build/trans_presets.java:1543
+#: build/trans_presets.java:273 build/trans_presets.java:291
+#: build/trans_presets.java:311 build/trans_presets.java:344
+#: build/trans_presets.java:389 build/trans_presets.java:405
+#: build/trans_presets.java:419 build/trans_presets.java:443
+#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:578
+#: build/trans_presets.java:598 build/trans_presets.java:618
+#: build/trans_presets.java:1183 build/trans_presets.java:1359
+#: build/trans_presets.java:1404
 msgid "Width (meters)"
 msgstr ""
@@ -18105 +17958 @@
 #. item "Highways/Streets/Residential" combo "Layer"
 #. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
 #. item "Highways/Streets/Service" combo "Layer"
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
 #. item "Ways/Construction" combo "Layer"
-#. item "Ways/Bridleway" combo "Layer"
-#. item "Ways/Cycleway" combo "Layer"
-#. item "Ways/Footway" combo "Layer"
-#. item "Ways/Pedestrian" combo "Layer"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Path" check "Oneway"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
-#. item "Ways/Track" check "Embankment"
-#. item "Ways/Track Grade 1" check "Embankment"
-#. item "Ways/Track Grade 2" check "Embankment"
-#. item "Ways/Track Grade 3" check "Embankment"
-#. item "Ways/Track Grade 4" check "Embankment"
-#. item "Ways/Track Grade 5" check "Embankment"
-#. item "Ways/Path" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:623
-#: build/trans_presets.java:644 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "Surface"
 msgstr "Pinta"
@@ -18137 +17985 @@
 #. item "Highways/Streets/Residential" combo "Surface"
 #. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Pedestrian" combo "Surface"
 #. item "Highways/Streets/Service" combo "Surface"
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
 #. item "Ways/Construction" combo "Surface"
-#. item "Ways/Bridleway" combo "Surface"
-#. item "Ways/Cycleway" combo "Surface"
-#. item "Ways/Footway" combo "Surface"
-#. item "Ways/Pedestrian" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Ways/Dedicated Bridleway" combo "Surface"
+#. item "Ways/Dedicated Cycleway" combo "Surface"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface"
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface"
+#. item "Ways/Dedicated Footway" combo "Surface"
 #. item "Ways/Steps" combo "Surface"
-#. item "Ways/Track" combo "Surface"
-#. item "Ways/Track Grade 1" combo "Surface"
-#. item "Ways/Path" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "paved"
 msgstr "päällystetty"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "unpaved"
 msgstr "päällystämätön"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "asphalt"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "concrete"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "metal"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "wood"
 msgstr "metsä"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "paving_stones"
 msgstr ""
 
-#. item "Ways/Track Grade 2" combo "Surface"
-#. item "Ways/Track Grade 3" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "cobblestone"
 msgstr "mukulakivi"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "gravel"
 msgstr "sora"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "pebblestone"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "compacted"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "grass_paver"
 msgstr ""
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "grass"
 msgstr "ruoho"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "sand"
 msgstr "hiekka"
 
-#. item "Ways/Track Grade 4" combo "Surface"
-#. item "Ways/Track Grade 5" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "ground"
 msgstr "maa"
@@ -18330 +18180 @@
 #. </optional>
 #: build/trans_presets.java:276
+msgid "Pedestrian"
+msgstr "Kävelykatu"
+
+#. item "Highways/Streets/Pedestrian"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#: build/trans_presets.java:279
+msgid "Edit Pedestrian Street"
+msgstr "Muokkaa kävelykadun ominaisuuksia"
+
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:294
 msgid "Service"
 msgstr ""
@@ -18336 +18199 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:297
 msgid "Edit Serviceway"
 msgstr ""
@@ -18344 +18207 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "parking_aisle"
 msgstr ""
@@ -18363 +18226 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:314
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -18371 +18234 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:300
+#: build/trans_presets.java:318
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
@@ -18377 +18240 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:310
+#: build/trans_presets.java:328
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -18384 +18247 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:313
+#: build/trans_presets.java:331
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -18391 +18254 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:348
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:331
+#: build/trans_presets.java:349
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:333
+#: build/trans_presets.java:351
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:352
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -18412 +18275 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#. item "Ways/Track Grade 1" combo "Layer"
-#. item "Ways/Track Grade 2" combo "Layer"
-#. item "Ways/Track Grade 3" combo "Layer"
-#. item "Ways/Track Grade 4" combo "Layer"
-#. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:335 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:646
+#: build/trans_presets.java:353 build/trans_presets.java:464
 msgid "Access"
 msgstr "Pääsy (access)"
@@ -18438 +18293 @@
 #. item "Ways/Track" combo "Motorcycle"
 #. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
 #. item "Ways/Path" combo "Foot"
 #. item "Ways/Path" combo "Bicycle"
@@ -18475 +18315 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666 build/trans_presets.java:1407
-#: build/trans_presets.java:1408 build/trans_presets.java:1411
-#: build/trans_presets.java:1412 build/trans_presets.java:1413
-#: build/trans_presets.java:1532 build/trans_presets.java:1533
-#: build/trans_presets.java:1534 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
-#: build/trans_presets.java:2428 build/trans_presets.java:2464
-#: build/trans_presets.java:2473 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:1268
+#: build/trans_presets.java:1269 build/trans_presets.java:1272
+#: build/trans_presets.java:1273 build/trans_presets.java:1274
+#: build/trans_presets.java:1393 build/trans_presets.java:1394
+#: build/trans_presets.java:1395 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:2289 build/trans_presets.java:2325
+#: build/trans_presets.java:2334 build/trans_presets.java:2335
+#: build/trans_presets.java:2336 build/trans_presets.java:2620
 msgid "yes"
 msgstr "kyllä"
@@ -18512 +18345 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:212
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:212
 msgid "private"
 msgstr "yksityinen"
 
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "designated"
 msgstr ""
@@ -18558 +18376 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:219
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:219
 msgid "destination"
 msgstr "määränpää"
@@ -18593 +18404 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:205
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:335 build/trans_presets.java:339
-#: build/trans_presets.java:342 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648
+#: build/trans_presets.java:353 build/trans_presets.java:357
+#: build/trans_presets.java:360 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666 build/trans_presets.java:785
-#: build/trans_presets.java:800 build/trans_presets.java:1344
-#: build/trans_presets.java:1407 build/trans_presets.java:1408
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:1532
-#: build/trans_presets.java:1533 build/trans_presets.java:1534
-#: build/trans_presets.java:1767 build/trans_presets.java:1777
-#: build/trans_presets.java:2427 build/trans_presets.java:2428
-#: build/trans_presets.java:2464 build/trans_presets.java:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1268 build/trans_presets.java:1269
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:1393
+#: build/trans_presets.java:1394 build/trans_presets.java:1395
+#: build/trans_presets.java:1628 build/trans_presets.java:1638
+#: build/trans_presets.java:2288 build/trans_presets.java:2289
+#: build/trans_presets.java:2325 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:2620
 msgid "no"
 msgstr "ei"
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:356
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:339
+#: build/trans_presets.java:357
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -18675 +18464 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:340 build/trans_presets.java:663
-#: build/trans_presets.java:870 build/trans_presets.java:903
-#: build/trans_presets.java:925 build/trans_presets.java:962
-#: build/trans_presets.java:975 build/trans_presets.java:987
-#: build/trans_presets.java:999 build/trans_presets.java:1011
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:358 build/trans_presets.java:488
+#: build/trans_presets.java:731 build/trans_presets.java:764
+#: build/trans_presets.java:786 build/trans_presets.java:823
+#: build/trans_presets.java:836 build/trans_presets.java:848
+#: build/trans_presets.java:860 build/trans_presets.java:872
+#: build/trans_presets.java:912
 msgid "Horse"
 msgstr "Hevonen"
@@ -18694 +18483 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:341 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:647 build/trans_presets.java:871
-#: build/trans_presets.java:889 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:963
-#: build/trans_presets.java:976 build/trans_presets.java:988
-#: build/trans_presets.java:1000 build/trans_presets.java:1012
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:359 build/trans_presets.java:465
+#: build/trans_presets.java:732 build/trans_presets.java:750
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:824 build/trans_presets.java:837
+#: build/trans_presets.java:849 build/trans_presets.java:861
+#: build/trans_presets.java:873 build/trans_presets.java:913
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -18715 +18501 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:342 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:648 build/trans_presets.java:666
-#: build/trans_presets.java:890 build/trans_presets.java:905
-#: build/trans_presets.java:927 build/trans_presets.java:964
-#: build/trans_presets.java:977 build/trans_presets.java:989
-#: build/trans_presets.java:1001 build/trans_presets.java:1013
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:360 build/trans_presets.java:466
+#: build/trans_presets.java:492 build/trans_presets.java:751
+#: build/trans_presets.java:766 build/trans_presets.java:788
+#: build/trans_presets.java:825 build/trans_presets.java:838
+#: build/trans_presets.java:850 build/trans_presets.java:862
+#: build/trans_presets.java:874 build/trans_presets.java:914
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:343
+#: build/trans_presets.java:361
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
-#: build/trans_presets.java:344
+#: build/trans_presets.java:362
 msgid "Motorboat"
 msgstr "Moottorivene"
 
-#: build/trans_presets.java:345
+#: build/trans_presets.java:363
 msgid "Boat"
 msgstr "Vene"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:347
+#: build/trans_presets.java:365
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -18746 +18529 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:348 build/trans_presets.java:386
+#: build/trans_presets.java:366 build/trans_presets.java:404
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:367
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:350
+#: build/trans_presets.java:368
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:369
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:353
+#: build/trans_presets.java:371
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -18775 +18558 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:358
+#: build/trans_presets.java:376
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -18793 +18576 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_presets.java:379 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -18818 +18601 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_presets.java:379 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -18843 +18626 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_presets.java:379 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -18868 +18651 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_presets.java:379 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18881 +18664 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:617
+#: build/trans_presets.java:379 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "unclassified"
 msgstr "tie"
@@ -18897 +18680 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3221
+#: build/trans_presets.java:379 build/trans_style.java:3252
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "living_street"
 msgstr "pihakatu"
@@ -18929 +18712 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:673
-#: build/trans_style.java:4326
+#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "bus_guideway"
 msgstr ""
@@ -18962 +18745 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:880
-#: build/trans_style.java:3286 build/trans_style.java:3287
+#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
 msgstr ""
@@ -18972 +18755 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:379
+#: build/trans_presets.java:397
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:409
 msgid "Edit Tunnel"
 msgstr ""
@@ -18983 +18766 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:405
+#: build/trans_presets.java:423
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:406
+#: build/trans_presets.java:424
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:425
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:423
+#: build/trans_presets.java:441
 msgid "Junction"
 msgstr "Liittymä"
@@ -19011 +18794 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:898
+#: build/trans_presets.java:441 build/trans_style.java:898
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -19017 +18800 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:446
+msgid "Track"
+msgstr "Metsätie (track)"
+
+#. item "Ways/Track"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#: build/trans_presets.java:449
+msgid "Edit Track"
+msgstr "Muokkaa metsätien ominaisuuksia"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "Tracktype"
+msgstr "Metsätie (track)"
+
+#. item "Ways/Track" combo "Tracktype"
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade1"
+msgstr "sora"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade2"
+msgstr "sora"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade3"
+msgstr "sora"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade4"
+msgstr "sora"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade5"
+msgstr "sora"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
+msgid "MTB Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Path" combo "MTB Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "SAC Scale"
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:3051
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "mountain_hiking"
+msgstr "Lähde"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "difficult_alpine_hiking"
+msgstr ""
+
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:470
+msgid "Path"
+msgstr "Polku"
+
+#. item "Ways/Path"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#: build/trans_presets.java:473
+msgid "Edit Path"
+msgstr ""
+
+#: build/trans_presets.java:489
+#, fuzzy
+msgid "Wheelchairs"
+msgstr "Pyörätuoli"
+
+#: build/trans_presets.java:490
+msgid "Ski"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Snowmobile"
+msgstr "Moottorikelkka"
+
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:429
-msgid "Bridleway"
-msgstr "Ratsastustie"
-
-#. item "Ways/Bridleway"
+#: build/trans_presets.java:499
+#, fuzzy
+msgid "Dedicated Bridleway"
+msgstr "Muokkaa ratsastustien ominaisuuksia"
+
+#. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:431
+#: build/trans_presets.java:501
 msgid "Edit Bridleway"
 msgstr "Muokkaa ratsastustien ominaisuuksia"
 
-#. item "Ways/Bridleway" text "Width (meters)"
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:447
-msgid "Cycleway"
-msgstr "Pyörätie"
-
-#. item "Ways/Cycleway"
+#: build/trans_presets.java:517
+#, fuzzy
+msgid "Dedicated Cycleway"
+msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
+
+#. item "Ways/Dedicated Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:451
+#. item "Ways/Segregated Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:563
 msgid "Edit Cycleway"
 msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
 
-#. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:461
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#: build/trans_presets.java:531
 msgid "Pedestrians"
 msgstr ""
 
-#. item "Ways/Cycleway" text "Width (meters)"
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:468
-msgid "Footway"
-msgstr "Jalankulkutie"
-
-#. item "Ways/Footway"
+#: build/trans_presets.java:537
+msgid "Segregated Foot- and Cycleway"
+msgstr ""
+
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:559
+#, fuzzy
+msgid "Combined Foot- and Cycleway"
+msgstr "Yhdistä silti"
+
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:581
+#, fuzzy
+msgid "Dedicated Footway"
+msgstr "Muokkaa jalkakäytävän ominaisuuksia"
+
+#. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:471
+#: build/trans_presets.java:584
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
 
-#. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:481
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:594
 msgid "Bikes"
 msgstr ""
 
-#. item "Ways/Footway" text "Width (meters)"
+#. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:488
-msgid "Pedestrian"
-msgstr "Kävelykatu"
-
-#. item "Ways/Pedestrian"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:491
-msgid "Edit Pedestrian Street"
-msgstr "Muokkaa kävelykadun ominaisuuksia"
-
-#. item "Ways/Pedestrian" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:506
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Portaat"
@@ -19088 +18991 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:510
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
@@ -19094 +18997 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:527
-msgid "Track"
-msgstr "Metsätie (track)"
-
-#. item "Ways/Track"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:530
-msgid "Edit Track"
-msgstr "Muokkaa metsätien ominaisuuksia"
-
-#. item "Ways/Track" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:547
-msgid "Track Grade 1"
-msgstr ""
-
-#. item "Ways/Track Grade 1"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:550
-msgid "Edit Track of grade 1"
-msgstr ""
-
-#. item "Ways/Track Grade 1" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:568
-msgid "Track Grade 2"
-msgstr ""
-
-#. item "Ways/Track Grade 2"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:571
-msgid "Edit Track of grade 2"
-msgstr ""
-
-#. item "Ways/Track Grade 2" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:589
-msgid "Track Grade 3"
-msgstr ""
-
-#. item "Ways/Track Grade 3"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:592
-msgid "Edit Track of grade 3"
-msgstr ""
-
-#. item "Ways/Track Grade 3" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:610
-msgid "Track Grade 4"
-msgstr ""
-
-#. item "Ways/Track Grade 4"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:613
-msgid "Edit Track of grade 4"
-msgstr ""
-
-#. item "Ways/Track Grade 4" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:631
-msgid "Track Grade 5"
-msgstr ""
-
-#. item "Ways/Track Grade 5"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:634
-msgid "Edit Track of grade 5"
-msgstr ""
-
-#. item "Ways/Track Grade 5" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:653
-msgid "Path"
-msgstr "Polku"
-
-#. item "Ways/Path"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:656
-msgid "Edit Path"
-msgstr ""
-
-#: build/trans_presets.java:664
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:665
-msgid "Snowmobile"
-msgstr "Moottorikelkka"
-
-#. item "Ways/Path" text "Width (meters)"
-#. </optional>
-#. item "Tourism/Map" label "Routes shown for:"
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:682 build/trans_presets.java:1729
-#: build/trans_presets.java:1752
-msgid "Hiking"
-msgstr ""
-
-#. item "Ways/Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:686
-msgid "Edit Hiking"
-msgstr ""
-
-#. item "Ways/Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:695
-msgid "Mountain Hiking"
-msgstr ""
-
-#. item "Ways/Mountain Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:699
-msgid "Edit Mountain Hiking"
-msgstr ""
-
-#. item "Ways/Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:708
-msgid "Demanding Mountain Hiking"
-msgstr ""
-
-#. item "Ways/Demanding Mountain Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:712
-msgid "Edit Demanding Mountain Hiking"
-msgstr ""
-
-#. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:721
-msgid "Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:725
-msgid "Edit Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:734
-msgid "Demanding Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Demanding Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:738
-msgid "Edit Demanding Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:747
-msgid "Difficult Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Difficult Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:751
-msgid "Edit Difficult Alpine Hiking"
-msgstr ""
-
-#. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:761
+#: build/trans_presets.java:622
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:762
+#: build/trans_presets.java:623
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -19293 +19008 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:764
+#: build/trans_presets.java:625
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:629
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:631
 msgid "Services"
 msgstr ""
@@ -19309 +19024 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:772
+#: build/trans_presets.java:633
 msgid "Edit Service Station"
 msgstr ""
@@ -19346 +19061 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:777 build/trans_presets.java:914
-#: build/trans_presets.java:1396 build/trans_presets.java:1420
-#: build/trans_presets.java:1426 build/trans_presets.java:1434
-#: build/trans_presets.java:1441 build/trans_presets.java:1765
-#: build/trans_presets.java:1775 build/trans_presets.java:2204
-#: build/trans_presets.java:2306 build/trans_presets.java:2336
-#: build/trans_presets.java:2388 build/trans_presets.java:2396
-#: build/trans_presets.java:2413 build/trans_presets.java:2425
-#: build/trans_presets.java:2434 build/trans_presets.java:2441
-#: build/trans_presets.java:2495 build/trans_presets.java:2505
-#: build/trans_presets.java:2557 build/trans_presets.java:2723
-#: build/trans_presets.java:2738 build/trans_presets.java:2777
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:638 build/trans_presets.java:775
+#: build/trans_presets.java:1257 build/trans_presets.java:1281
+#: build/trans_presets.java:1287 build/trans_presets.java:1295
+#: build/trans_presets.java:1302 build/trans_presets.java:1626
+#: build/trans_presets.java:1636 build/trans_presets.java:2065
+#: build/trans_presets.java:2167 build/trans_presets.java:2197
+#: build/trans_presets.java:2249 build/trans_presets.java:2257
+#: build/trans_presets.java:2274 build/trans_presets.java:2286
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2356 build/trans_presets.java:2366
+#: build/trans_presets.java:2418 build/trans_presets.java:2584
+#: build/trans_presets.java:2599 build/trans_presets.java:2638
+#: build/trans_presets.java:3058
 msgid "Operator"
 msgstr "Operaattori"
@@ -19365 +19080 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:781
+#: build/trans_presets.java:642
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -19373 +19088 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:785
+#: build/trans_presets.java:646
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -19380 +19095 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:786 build/trans_presets.java:802
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:647 build/trans_presets.java:663
+#: build/trans_presets.java:1206
 msgid "Cross on horseback"
 msgstr ""
@@ -19408 +19123 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:787 build/trans_presets.java:801
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:648 build/trans_presets.java:662
+#: build/trans_presets.java:1207
 msgid "Cross by bicycle"
 msgstr ""
@@ -19416 +19131 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:788 build/trans_presets.java:803
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:1208
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:789
+#: build/trans_presets.java:650
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19428 +19143 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:792
+#: build/trans_presets.java:653
 msgid "Stop"
 msgstr ""
@@ -19459 +19174 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:795
+#: build/trans_presets.java:656
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19466 +19181 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:798
+#: build/trans_presets.java:659
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:804
+#: build/trans_presets.java:665
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:806
+#: build/trans_presets.java:667
 msgid "Mini-roundabout"
 msgstr ""
@@ -19484 +19199 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:813
+#: build/trans_presets.java:674
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -19501 +19216 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:679
 msgid "City Limit"
 msgstr ""
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:819
+#: build/trans_presets.java:680
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:824
+#: build/trans_presets.java:685
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:826
+#: build/trans_presets.java:687
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
@@ -19522 +19237 @@
 #. item "Waypoints/Speed Camera"
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:690
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -19528 +19243 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:693
 msgid "Incline"
 msgstr ""
@@ -19534 +19249 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:835
+#: build/trans_presets.java:696
 msgid "Incline Steep"
 msgstr ""
@@ -19541 +19256 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:700
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:701
 msgid "Edit Ford"
 msgstr ""
@@ -19552 +19267 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:847
+#: build/trans_presets.java:708
 msgid "Mountain Pass"
 msgstr ""
@@ -19558 +19273 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:849
+#: build/trans_presets.java:710
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19568 +19283 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:854 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2891
-#: build/trans_presets.java:2898 build/trans_presets.java:2905
+#: build/trans_presets.java:715 build/trans_presets.java:1465
+#: build/trans_presets.java:1610 build/trans_presets.java:2752
+#: build/trans_presets.java:2759 build/trans_presets.java:2766
 msgid "Elevation"
 msgstr ""
@@ -19576 +19291 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:858
+#: build/trans_presets.java:719
 msgid "Barriers"
 msgstr "Esteet"
@@ -19582 +19297 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:861
+#: build/trans_presets.java:722
 msgid "Bollard"
 msgstr ""
@@ -19588 +19303 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:724
 msgid "Edit Bollard"
 msgstr ""
@@ -19631 +19346 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:866 build/trans_presets.java:885
-#: build/trans_presets.java:899 build/trans_presets.java:921
-#: build/trans_presets.java:958 build/trans_presets.java:971
-#: build/trans_presets.java:983 build/trans_presets.java:995
-#: build/trans_presets.java:1007 build/trans_presets.java:1019
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:727 build/trans_presets.java:746
+#: build/trans_presets.java:760 build/trans_presets.java:782
+#: build/trans_presets.java:819 build/trans_presets.java:832
+#: build/trans_presets.java:844 build/trans_presets.java:856
+#: build/trans_presets.java:868 build/trans_presets.java:880
+#: build/trans_presets.java:890 build/trans_presets.java:899
+#: build/trans_presets.java:908
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:734
 msgid "Cycle Barrier"
 msgstr ""
@@ -19649 +19364 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:877
+#: build/trans_presets.java:738
 msgid "Block"
 msgstr ""
@@ -19655 +19370 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:880
+#: build/trans_presets.java:741
 msgid "Cattle Grid"
 msgstr ""
@@ -19661 +19376 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:882
+#: build/trans_presets.java:743
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:753
 msgid "Bus Trap"
 msgstr ""
@@ -19672 +19387 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:895
+#: build/trans_presets.java:756
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:757
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:768
 msgid "Toll Booth"
 msgstr ""
@@ -19688 +19403 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:770
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19694 +19409 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:917
+#: build/trans_presets.java:778
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:779
 msgid "Edit Border Control"
 msgstr ""
@@ -19707 +19422 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:932
+#: build/trans_presets.java:793
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -19714 +19429 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:936
+#: build/trans_presets.java:797
 msgid "Fence"
 msgstr "Aita"
@@ -19721 +19436 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:940
+#: build/trans_presets.java:801
 msgid "Wall"
 msgstr "Muuri"
@@ -19727 +19442 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:943
+#: build/trans_presets.java:804
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -19734 +19449 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:947
+#: build/trans_presets.java:808
 msgid "Retaining Wall"
 msgstr ""
@@ -19744 +19459 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:954
+#: build/trans_presets.java:815
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:955
+#: build/trans_presets.java:816
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:827
 msgid "Gate"
 msgstr "Portti"
@@ -19760 +19475 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:829
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:840
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:980
+#: build/trans_presets.java:841
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:852
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:853
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:864
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:865
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:876
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:877
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:885
 msgid "Stile"
 msgstr ""
@@ -19811 +19526 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:887
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:895
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:896
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:904
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:905
 msgid "Edit Sally Port"
 msgstr ""
@@ -19840 +19555 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1058 build/trans_presets.java:1059
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:919 build/trans_presets.java:920
+#: build/trans_presets.java:963
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:1060
+#: build/trans_presets.java:921
 msgid "Spring"
 msgstr "Lähde"
@@ -19852 +19567 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:923
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -19858 +19573 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:928
 msgid "Drain"
 msgstr ""
@@ -19864 +19579 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1069
+#: build/trans_presets.java:930
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:936
 msgid "Stream"
 msgstr ""
@@ -19875 +19590 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:938
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:944
 msgid "Canal"
 msgstr "Kanava"
@@ -19886 +19601 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:946
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:952
 msgid "River"
 msgstr "Joki"
@@ -19899 +19614 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:956
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -19905 +19620 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:965
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:969
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:970
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -19921 +19636 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:975
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:976
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:981
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -19937 +19652 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:983
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:988
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:989
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19953 +19668 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:994
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -19960 +19675 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:997
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1001
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -19974 +19689 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1006
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "bog"
 msgstr "räme"
@@ -19995 +19710 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3453
+#: build/trans_presets.java:1009 build/trans_style.java:3484
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1011
 msgid "Mud"
 msgstr "Muta"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1151
+#: build/trans_presets.java:1012
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1016
 msgid "Beach"
 msgstr "Ranta"
@@ -20031 +19746 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1018
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1022
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1023
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1027
 msgid "Cliff"
 msgstr "Kallio"
@@ -20052 +19767 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1029
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1033
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -20063 +19778 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1035
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -20069 +19784 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1040
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -20075 +19790 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1042
 msgid "Edit Ferry"
 msgstr ""
@@ -20082 +19797 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1189
+#: build/trans_presets.java:1050
 msgid "Boatyard"
 msgstr ""
@@ -20088 +19803 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1052
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1057
 msgid "Dock"
 msgstr "Telakka"
@@ -20099 +19814 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1059
 msgid "Edit Dock"
 msgstr ""
@@ -20105 +19820 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1065
 msgid "Dam"
 msgstr "Pato"
@@ -20111 +19826 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1067
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1073
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1074
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -20128 +19843 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1078
 msgid "Weir"
 msgstr ""
@@ -20134 +19849 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1080
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1085
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1086
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1091
 msgid "Turning Point"
 msgstr ""
@@ -20156 +19871 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1095
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1096
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1100
 msgid "Pier"
 msgstr "Laituri"
@@ -20172 +19887 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1102
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1106
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -20183 +19898 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1108
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1112
 msgid "Slipway"
 msgstr ""
@@ -20196 +19911 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1116
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1122
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1123
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1124
 msgid "Rail"
 msgstr "Rata"
@@ -20217 +19932 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1126
 msgid "Edit Rail"
 msgstr ""
@@ -20245 +19960 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "Optional Types"
 msgstr ""
@@ -20260 +19975 @@
 #. item "Transport/Railway/Tram" combo "Optional Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1131
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1132
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1137
 msgid "Monorail"
 msgstr "Monorail"
@@ -20296 +20011 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1139
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1144
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1145
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1150
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1151
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1156
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1157
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1162
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1163
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:1168
 msgid "Bus Guideway"
 msgstr ""
@@ -20342 +20057 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:1170
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -20349 +20064 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1187
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1188
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
 
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1193
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -20365 +20080 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1197
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -20372 +20087 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1201
 msgid "Crossing"
 msgstr "Risteys"
@@ -20380 +20095 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1205
 msgid "Crossing type"
 msgstr ""
@@ -20386 +20101 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1211
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -20393 +20108 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1216
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1217
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -20404 +20119 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1219
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1223
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -20415 +20130 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1225
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1229
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -20426 +20141 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1231
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1235
 msgid "Gondola"
 msgstr ""
@@ -20437 +20152 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1237
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1241
 msgctxt "aerialway"
 msgid "Station"
@@ -20449 +20164 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1243
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -20455 +20170 @@
 
 #. group "Car"
-#: build/trans_presets.java:1389
+#: build/trans_presets.java:1250
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -20463 +20178 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1254
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
@@ -20519 +20234 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1690 build/trans_presets.java:1703
-#: build/trans_presets.java:1717 build/trans_presets.java:1814
-#: build/trans_presets.java:1822 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:2244
-#: build/trans_presets.java:2268 build/trans_presets.java:2496
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1536 build/trans_presets.java:1543
+#: build/trans_presets.java:1551 build/trans_presets.java:1564
+#: build/trans_presets.java:1578 build/trans_presets.java:1675
+#: build/trans_presets.java:1683 build/trans_presets.java:1786
+#: build/trans_presets.java:1792 build/trans_presets.java:2105
+#: build/trans_presets.java:2129 build/trans_presets.java:2357
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -20603 +20318 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -20702 +20417 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1399 build/trans_presets.java:1445
+#: build/trans_presets.java:1260 build/trans_presets.java:1306
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20710 +20425 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1263
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -20719 +20434 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1405 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2426
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:1266 build/trans_presets.java:1627
+#: build/trans_presets.java:1637 build/trans_presets.java:2287
+#: build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2338
+#: build/trans_presets.java:1267 build/trans_presets.java:2199
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1268
 msgid "Park and Ride"
 msgstr ""
@@ -20746 +20461 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1408 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
+#: build/trans_presets.java:1269 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1271
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1411
+#: build/trans_presets.java:1272
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1273
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1274
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1275
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1277
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1278
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1283
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1284
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -20795 +20510 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1428 build/trans_presets.java:1452
+#: build/trans_presets.java:1289 build/trans_presets.java:1313
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -20802 +20517 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1292
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1297
 msgid "Sharing"
 msgstr ""
@@ -20813 +20528 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1299
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20819 +20534 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1308
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1311
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
@@ -20831 +20546 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1316
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1321
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1322
 msgctxt "railway"
 msgid "Station"
@@ -20849 +20564 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1464
+#: build/trans_presets.java:1325
 msgctxt "railway"
 msgid "Edit Station"
@@ -20855 +20570 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1330
 msgid "UIC-Reference"
 msgstr ""
@@ -20861 +20576 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1333
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -20867 +20582 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1335
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -20873 +20588 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1342
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -20880 +20595 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1345
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -20886 +20601 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1352
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -20893 +20608 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1355
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -20903 +20618 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1542
+#: build/trans_presets.java:1358 build/trans_presets.java:1403
 msgid "Reference (track number)"
 msgstr ""
@@ -20909 +20624 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1544
+#: build/trans_presets.java:1360 build/trans_presets.java:1405
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1362
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -20921 +20636 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1365
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509 build/trans_presets.java:2428
+#: build/trans_presets.java:1370 build/trans_presets.java:2289
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -20933 +20648 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1375
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -20940 +20655 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1378
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -20946 +20661 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1384
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -20954 +20669 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1388
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -20961 +20676 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1789
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:1393 build/trans_presets.java:1650
+#: build/trans_presets.java:2334
 msgid "Shelter"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1533 build/trans_presets.java:2461
+#: build/trans_presets.java:1394 build/trans_presets.java:2322
 msgid "Bench"
 msgstr "Penkki"
 
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1395
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1399
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1400
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20987 +20702 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1408
 msgid "Taxi"
 msgstr "Taksi"
@@ -20993 +20708 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1410
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -20999 +20714 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1415
 msgid "Airport"
 msgstr "Lentokenttä"
@@ -21005 +20720 @@
 #. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1417
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1422
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1423
 msgid "ICAO"
 msgstr "ICAO"
@@ -21021 +20736 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1428
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1429
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -21036 +20751 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1430 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -21043 +20758 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1433
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1436
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1577
+#: build/trans_presets.java:1438
 msgid "Motel"
 msgstr "Motelli"
@@ -21059 +20774 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1440
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1583
+#: build/trans_presets.java:1444
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1445
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1449
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -21080 +20795 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1451
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1455
 msgid "Hostel"
 msgstr "Hostelli"
@@ -21091 +20806 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1457
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1461
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1462
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1467
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1468
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1472
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -21122 +20837 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1474
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1479
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -21136 +20851 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1619 build/trans_surveyor.java:47
+#: build/trans_presets.java:1480 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -21142 +20857 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1482
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -21148 +20863 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "Cuisine"
 msgstr ""
@@ -21154 +20869 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1488
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -21216 +20931 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1490
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1496
 msgid "Cafe"
 msgstr "Kahvila"
@@ -21226 +20941 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1498
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1503
 msgid "Pub"
 msgstr ""
@@ -21236 +20951 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1505
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1510
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1511
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1516
 msgid "Bar"
 msgstr ""
@@ -21255 +20970 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1518
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1523
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -21265 +20980 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1525
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1531
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1532
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1533
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1538
 msgid "Museum"
 msgstr "Museo"
@@ -21290 +21005 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1540
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1545
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -21301 +21016 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1548
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1553
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -21311 +21026 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1555
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1558
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1560
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1561
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1566
 msgid "Artwork"
 msgstr "Taideteos"
@@ -21336 +21051 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1568
 msgid "Edit Artwork"
 msgstr ""
@@ -21342 +21057 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1573
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1580
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "topo"
 msgstr ""
@@ -21392 +21107 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_presets.java:1585 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21398 +21113 @@
 msgstr ""
 
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1726 build/trans_presets.java:1742
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1587 build/trans_presets.java:1603
+#: build/trans_presets.java:1647
 msgid "Closer Description"
 msgstr ""
@@ -21429 +21144 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:1589 build/trans_presets.java:1612
 msgid "Routes shown for:"
+msgstr ""
+
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:1590 build/trans_presets.java:1613
+msgid "Hiking"
 msgstr ""
 
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1591 build/trans_presets.java:1614
+#: build/trans_presets.java:1832
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -21442 +21163 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1731 build/trans_presets.java:1754
+#: build/trans_presets.java:1592 build/trans_presets.java:1615
 msgid "Mountainbiking"
 msgstr ""
@@ -21448 +21169 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1732 build/trans_presets.java:1755
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:1593 build/trans_presets.java:1616
+#: build/trans_presets.java:1886
 msgid "Skiing"
 msgstr ""
@@ -21455 +21176 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1733 build/trans_presets.java:1756
+#: build/trans_presets.java:1594 build/trans_presets.java:1617
 msgid "Riding"
 msgstr ""
@@ -21461 +21182 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1734 build/trans_presets.java:1757
+#: build/trans_presets.java:1595 build/trans_presets.java:1618
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1597
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1605
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1620
 msgid "Information Terminal"
 msgstr ""
@@ -21508 +21229 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1764 build/trans_presets.java:1774
+#: build/trans_presets.java:1625 build/trans_presets.java:1635
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1630
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1640
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1641
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1643
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1651
 msgid "Edit Shelter"
 msgstr ""
@@ -21538 +21259 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1793 build/trans_presets.java:1799
+#: build/trans_presets.java:1654 build/trans_presets.java:1660
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1656
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1657
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1663
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1664
 msgid "Castle"
 msgstr "Linna"
@@ -21565 +21286 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1667
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1671
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1672
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1677
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -21586 +21307 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1680
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1685
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -21596 +21317 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1687
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1691
 msgid "Palaeontological Site"
 msgstr ""
@@ -21607 +21328 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1693
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21613 +21334 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1698
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1699
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1703
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -21629 +21350 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1705
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1709
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1710
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1714
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1715
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1719
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1720
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1725
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1726
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1727
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1731
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -21685 +21406 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1733
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1737
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1738
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1883 build/trans_presets.java:2703
+#: build/trans_presets.java:1744 build/trans_presets.java:2564
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1745
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1746
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1747
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -21727 +21448 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1751 build/trans_presets.java:1760
+#: build/trans_presets.java:1769 build/trans_presets.java:1778
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -22118 +21839 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3674 build/trans_style.java:3682
-#: build/trans_style.java:3690 build/trans_style.java:3698
-#: build/trans_style.java:3706 build/trans_style.java:3714
-#: build/trans_style.java:3722 build/trans_style.java:3730
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_style.java:3705 build/trans_style.java:3713
+#: build/trans_style.java:3721 build/trans_style.java:3729
+#: build/trans_style.java:3737 build/trans_style.java:3745
+#: build/trans_style.java:3753 build/trans_style.java:3761
+#: build/trans_style.java:3769 build/trans_style.java:3777
+#: build/trans_style.java:3785 build/trans_style.java:3793
+#: build/trans_style.java:3801 build/trans_style.java:3809
+#: build/trans_style.java:3817 build/trans_style.java:3825
+#: build/trans_style.java:3833 build/trans_style.java:3841
+#: build/trans_style.java:3849 build/trans_style.java:3857
+#: build/trans_style.java:3865 build/trans_style.java:3873
+#: build/trans_style.java:3881 build/trans_style.java:3889
+#: build/trans_style.java:3897 build/trans_style.java:3905
+#: build/trans_style.java:3913 build/trans_style.java:3921
+#: build/trans_style.java:3929 build/trans_style.java:3937
+#: build/trans_style.java:3945 build/trans_style.java:3953
+#: build/trans_style.java:3961 build/trans_style.java:3969
+#: build/trans_style.java:3977 build/trans_style.java:3985
+#: build/trans_style.java:3993 build/trans_style.java:4001
+#: build/trans_style.java:4009 build/trans_style.java:4017
+#: build/trans_style.java:4025 build/trans_style.java:4033
+#: build/trans_style.java:4041 build/trans_style.java:4049
+#: build/trans_style.java:4057 build/trans_style.java:4065
+#: build/trans_style.java:4073
 msgid "sport"
 msgstr "urheilu"
@@ -22151 +21872 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1755
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1756
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1764
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1765
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1773
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1774
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1782
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1783
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1788
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1789
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1795
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1796
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1797
 msgid "Edit Multi"
 msgstr ""
@@ -22408 +22129 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "type"
 msgstr "tyyppi"
@@ -22461 +22182 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1802
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1803
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1808
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1809
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1814
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1815
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1820
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1821
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1826
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1827
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1833
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1838
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1839
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1844
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1845
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1850
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1851
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1856
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1857
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1862
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1863
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:1868
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:1869
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:1874
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:1875
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:1880
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:1881
 msgid "Edit Swimming"
 msgstr ""
@@ -22665 +22386 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:1888
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:1895
 msgid "Shooting"
 msgstr "Ammunta"
@@ -22722 +22443 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:1897
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:1903
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1904
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:1905
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:1910
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:1911
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:1916
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:1917
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1922
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:1923
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:1928
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:1929
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:1934
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:1935
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:1938
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:1940
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:1941
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:1946
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:1947
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:1952
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:1953
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:1958
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:1959
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:1964
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:1965
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:1970
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:1971
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:1976
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:1977
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:1982
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:1983
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:1988
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:1989
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:1994
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:1995
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2000
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2001
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2008
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2009
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2010
 msgid "Building"
 msgstr "Rakennus"
@@ -22905 +22626 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2013
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -22911 +22632 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2015
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2019
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -22922 +22643 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2021
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2025
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -22933 +22654 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2027
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2031
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -22945 +22666 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2034
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2038
 msgid "Prison"
 msgstr "Vankila"
@@ -22957 +22678 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2041
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2045
 msgid "Police"
 msgstr "Poliisiasema"
@@ -22970 +22691 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2049
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2053
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -22982 +22703 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2056
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2060
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -22993 +22714 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2062
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -22999 +22720 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2068
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2069
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2073
 msgid "School"
 msgstr "Koulu"
@@ -23015 +22736 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2075
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2079
 msgid "University"
 msgstr "Yliopisto"
@@ -23026 +22747 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2081
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2085
 msgid "College"
 msgstr "Korkeakoulu"
@@ -23037 +22758 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2087
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -23043 +22764 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2092
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -23050 +22771 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2095
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2099
 msgid "Library"
 msgstr "Kirjasto"
@@ -23062 +22783 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2102
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2107
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -23072 +22793 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2109
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2113
 msgid "Theatre"
 msgstr "Teatteri"
@@ -23084 +22805 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2116
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2120
 msgid "Place of Worship"
 msgstr ""
@@ -23097 +22818 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2124
 msgid "Edit Place of Worship"
 msgstr ""
@@ -23104 +22825 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "Religion"
 msgstr "Uskonto"
@@ -23112 +22833 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "Denomination"
 msgstr ""
@@ -23180 +22901 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2132
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -23263 +22984 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2135
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -23269 +22990 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2137
 msgid "House number"
 msgstr "Talon numero"
@@ -23275 +22996 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2139
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2140
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2141
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2142
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2143
 msgid "Country code"
 msgstr "Maakoodi"
@@ -23302 +23023 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2149
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -23308 +23029 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2154
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2155
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2156
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2160
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2161
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2166
 msgid "Height (meters)"
 msgstr ""
@@ -23370 +23091 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2170
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2171
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2175
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2176
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2180
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -23396 +23117 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2182
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2186
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -23407 +23128 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2188
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2192
 msgid "Pipeline"
 msgstr "Putki"
@@ -23419 +23140 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2195
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2337 build/trans_presets.java:2379
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2201
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -23459 +23180 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2205
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2209
 msgid "Crane"
 msgstr "Nosturi"
@@ -23470 +23191 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2211
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2215
 msgid "Beacon"
 msgstr "Loisto"
@@ -23481 +23202 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2217
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2221
 msgid "Survey Point"
 msgstr ""
@@ -23492 +23213 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2223
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2227
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -23503 +23224 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -23509 +23230 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2234
 msgid "Power Generator"
 msgstr ""
@@ -23517 +23238 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2238
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2243
 msgid "Power Station"
 msgstr ""
@@ -23554 +23275 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2246
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2252
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -23566 +23287 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2255
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -23572 +23293 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2397 build/trans_presets.java:2414
+#: build/trans_presets.java:2258 build/trans_presets.java:2275
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2260
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -23586 +23307 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2265
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2267
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2269
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -23611 +23332 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2272
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2276
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2277
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2281
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2282
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2289
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2429 build/trans_presets.java:2559
+#: build/trans_presets.java:2290 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2292
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2297
 msgid "Telephone"
 msgstr "Puhelin"
@@ -23692 +23413 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2300
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -23698 +23419 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2442 build/trans_presets.java:2560
+#: build/trans_presets.java:2303 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Kolikot"
@@ -23704 +23425 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2443 build/trans_presets.java:2561
+#: build/trans_presets.java:2304 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -23710 +23431 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2444 build/trans_presets.java:2562
+#: build/trans_presets.java:2305 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23716 +23437 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2445 build/trans_presets.java:2563
+#: build/trans_presets.java:2306 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -23722 +23443 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2446 build/trans_presets.java:2564
+#: build/trans_presets.java:2307 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2308
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2310
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -23739 +23460 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2313
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -23745 +23466 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2315
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2316
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2317
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2318
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2319
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2320
 msgid "Scrap Metal"
 msgstr "Romumetalli"
@@ -23777 +23498 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2325
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "brown"
 msgstr ""
@@ -23880 +23601 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2466 build/trans_style.java:3126
-#: build/trans_style.java:3134 build/trans_style.java:3142
-#: build/trans_style.java:3150 build/trans_style.java:3158
-#: build/trans_style.java:3205 build/trans_style.java:3213
-#: build/trans_style.java:3311 build/trans_style.java:3319
+#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_style.java:3165 build/trans_style.java:3173
+#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3236 build/trans_style.java:3244
+#: build/trans_style.java:3342 build/trans_style.java:3350
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2328
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2330
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2331
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -23921 +23642 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2472 build/trans_presets.java:2948
+#: build/trans_presets.java:2333 build/trans_presets.java:2809
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2335
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2336
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2338
 msgid "Fountain"
 msgstr "Lähde"
@@ -23953 +23674 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2341
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2345
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -23965 +23686 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2348
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2352
 msgid "Baby Hatch"
 msgstr ""
@@ -23976 +23697 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2354
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2360
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2361
 msgid "Car Dealer"
 msgstr ""
@@ -23992 +23713 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2363
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2368
 msgid "Bike Dealer"
 msgstr ""
@@ -24004 +23725 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2371
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2375
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2376
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2381
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2382
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2387
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -24033 +23754 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2389
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2394
 msgid "Kiosk"
 msgstr "Kioski"
@@ -24043 +23764 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2396
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2401
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2402
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2407
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2408
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -24071 +23792 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -24077 +23798 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -24166 +23887 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2435
 msgid "Baker"
 msgstr "Leipomo"
@@ -24176 +23897 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2437
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2442
 msgid "Florist"
 msgstr ""
@@ -24186 +23907 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2444
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2449
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2450
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2594
+#: build/trans_presets.java:2455
 msgid "Alcohol"
 msgstr ""
@@ -24205 +23926 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2457
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2462
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2463
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2468
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2469
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2474
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2475
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2480
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2481
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2486
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2487
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2492
 msgid "Garden Centre"
 msgstr ""
@@ -24260 +23981 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2494
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2499
 msgid "Hardware"
 msgstr ""
@@ -24270 +23991 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2501
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2506
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -24280 +24001 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2508
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2513
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2514
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2519
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2520
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2525
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2526
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2531
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2532
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2537
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2538
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2543
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -24335 +24056 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2545
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2550
 msgid "Laundry"
 msgstr "Pesula"
@@ -24345 +24066 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2552
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2557
 msgid "Outdoor"
 msgstr ""
@@ -24355 +24076 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2559
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2565
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2570
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2571
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2578
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2579
 msgid "Bank"
 msgstr "Pankki"
@@ -24384 +24105 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2581
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2586 build/trans_presets.java:2595
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2588
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -24399 +24120 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2590
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -24405 +24126 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2597
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2602
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2603
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -24421 +24142 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2605
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2610
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2611
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2616
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -24440 +24161 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2618
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -24446 +24167 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2620
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2624
 msgid "Hospital"
 msgstr "Sairaala"
@@ -24456 +24177 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2626
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2630
 msgid "Emergency Access Point"
 msgstr ""
@@ -24468 +24189 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2633
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24475 +24196 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2636
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2637
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2639
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2640
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24496 +24217 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2643
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -24503 +24224 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2646
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2653
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2654
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2655
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2656
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2661
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2662
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2667
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2668
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2673
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2674
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2679
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2680
 msgid "Edit County"
 msgstr ""
@@ -24568 +24289 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2686
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2687
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2692
 msgid "Town"
 msgstr "Kaupunki"
@@ -24584 +24305 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2694
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2699
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -24595 +24316 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2701
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2706
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2707
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2712
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2713
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -24621 +24342 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2719
 msgid "Locality"
 msgstr ""
@@ -24627 +24348 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2721
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2726
 msgid "Island"
 msgstr "Saari"
@@ -24638 +24359 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2728
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2733
 msgid "Islet"
 msgstr ""
@@ -24649 +24370 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2735
 msgid "Edit Islet"
 msgstr ""
@@ -24655 +24376 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2741
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -24661 +24382 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2743
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2747
 msgid "Peak"
 msgstr "Huippu"
@@ -24672 +24393 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2749
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2754
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -24683 +24404 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2756
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2761
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -24694 +24415 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2763
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2769
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2770
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2771
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2776
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2777
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:2782
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2783
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2788
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2789
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2794
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2795
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2801
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2802
 msgid "Tree"
 msgstr "Puu"
@@ -24766 +24487 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2805
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2810
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2812
 msgid "Wood"
 msgstr "Metsä"
@@ -24783 +24504 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2815
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -24789 +24510 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2820
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -24808 +24529 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2823
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2829
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2830
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24823 +24544 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2835
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2836
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2840
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2841
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2845
 msgid "Fell"
 msgstr "Tunturi"
@@ -24849 +24570 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2847
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2851
 msgid "Heath"
 msgstr "Nummi"
@@ -24860 +24581 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2853
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -24866 +24587 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2858
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -24873 +24594 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2861
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2866
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2867
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:2872
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:2873
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:2878
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2879
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:2884
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2885
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -24919 +24640 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3030
+#: build/trans_presets.java:2891
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:2892
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:2896
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:2897
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2902
 msgid "Village Green"
 msgstr ""
@@ -24945 +24666 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:2904
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:2909
 msgid "Common"
 msgstr ""
@@ -24956 +24677 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:2911
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2915
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:2916
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:2920
 msgid "Recreation Ground"
 msgstr ""
@@ -24977 +24698 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:2922
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24983 +24704 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:2928
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:2929
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:2934
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -24999 +24720 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:2936
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:2942
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -25009 +24730 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2944
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:2951
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:2952
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:2957
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:2958
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:2963
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:2964
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:2969
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -25049 +24770 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:2971
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:2976
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:2977
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -25065 +24786 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2983
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:2984
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:2989
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:2990
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:2995
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:2996
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3001
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3002
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3007
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3008
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -25118 +24839 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3021
 msgid "Edit Multipolygon"
 msgstr ""
@@ -25125 +24846 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3027
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3028
 msgid "inner segment"
 msgstr ""
@@ -25136 +24857 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3031
 msgid "Turn restriction"
 msgstr ""
@@ -25143 +24864 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3034
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -25149 +24870 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_straight_on"
 msgstr ""
@@ -25185 +24906 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3041
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3042
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3043
 msgid "to way"
 msgstr ""
@@ -25201 +24922 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3046
 msgid "Route"
 msgstr ""
@@ -25208 +24929 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3049
 msgid "Edit Route"
 msgstr ""
@@ -25214 +24935 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "Route type"
 msgstr ""
@@ -25303 +25024 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3190 build/trans_style.java:233
+#: build/trans_presets.java:3051 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25311 +25032 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ski"
 msgstr ""
@@ -25381 +25102 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3190 build/trans_style.java:247
+#: build/trans_presets.java:3051 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25388 +25109 @@
 msgstr ""
 
-#: build/trans_presets.java:3190
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "detour"
 msgstr ""
@@ -25408 +25125 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3190 build/trans_style.java:1193
+#: build/trans_presets.java:3051 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3054
 msgid "Symbol description"
 msgstr ""
@@ -25419 +25136 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3057
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3060
 msgid "Color (hex)"
 msgstr ""
@@ -25452 +25169 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3202
+#: build/trans_presets.java:3063
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3064
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3065
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3066
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3067
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3068
 msgid "backward halt point"
 msgstr ""
@@ -25702 +25419 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4056
+#: build/trans_style.java:633 build/trans_style.java:4087
 msgid "deprecated"
 msgstr ""
@@ -26154 +25871 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1167
-#: build/trans_style.java:1231 build/trans_style.java:1239
-#: build/trans_style.java:1248 build/trans_style.java:1256
-#: build/trans_style.java:1264 build/trans_style.java:1265
-#: build/trans_style.java:1272
+#: build/trans_style.java:756 build/trans_style.java:1182
+#: build/trans_style.java:1246 build/trans_style.java:1254
+#: build/trans_style.java:1263 build/trans_style.java:1271
+#: build/trans_style.java:1279 build/trans_style.java:1280
+#: build/trans_style.java:1287
 msgid "rail"
 msgstr ""
@@ -26329 +26046 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1034
+#: build/trans_style.java:1041
 msgid "dock"
 msgstr ""
@@ -26385 +26102 @@
 #. <condition k="waterway" v="weir"/>
 #. <icon annotate="true" src="nautical/weir.png"/>
-#. color manmade
+#. color rapids
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26516 +26233 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1057 build/trans_style.java:1086
-#: build/trans_style.java:1094 build/trans_style.java:1095
-#: build/trans_style.java:1103 build/trans_style.java:1580
-#: build/trans_style.java:1587 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1636
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1667
-#: build/trans_style.java:1676 build/trans_style.java:1684
-#: build/trans_style.java:1692 build/trans_style.java:1700
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_works"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1064 build/trans_style.java:1093
+#: build/trans_style.java:1109 build/trans_style.java:1110
+#: build/trans_style.java:1118 build/trans_style.java:1603
+#: build/trans_style.java:1610 build/trans_style.java:1619
+#: build/trans_style.java:1627 build/trans_style.java:1659
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1690
+#: build/trans_style.java:1699 build/trans_style.java:1707
+#: build/trans_style.java:1715 build/trans_style.java:1723
+#: build/trans_style.java:1731
 msgid "manmade"
 msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="rapids"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1101
+#, fuzzy
+msgid "rapids"
+msgstr "Ruudukko"
 
 #. color manmade
@@ -26584 +26323 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1113 build/trans_style.java:1128
-#: build/trans_style.java:1143 build/trans_style.java:1151
-#: build/trans_style.java:1159
+#: build/trans_style.java:1128 build/trans_style.java:1143
+#: build/trans_style.java:1158 build/trans_style.java:1166
+#: build/trans_style.java:1174
 msgid "railwaypoint"
 msgstr ""
@@ -26607 +26346 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1176 build/trans_style.java:1185
+#: build/trans_style.java:1191 build/trans_style.java:1200
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1177
+#: build/trans_style.java:1192
 msgid "railover"
 msgstr ""
@@ -26646 +26385 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1201 build/trans_style.java:1211
-#: build/trans_style.java:1212 build/trans_style.java:1222
-#: build/trans_style.java:1223
+#: build/trans_style.java:1216 build/trans_style.java:1226
+#: build/trans_style.java:1227 build/trans_style.java:1237
+#: build/trans_style.java:1238
 msgid "oldrail"
 msgstr ""
@@ -26692 +26431 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1303 build/trans_style.java:1304
-#: build/trans_style.java:1336
+#: build/trans_style.java:1318 build/trans_style.java:1319
+#: build/trans_style.java:1351
 msgid "aeroway"
 msgstr ""
@@ -26705 +26444 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1327
 msgid "terminal"
 msgstr "terminaali"
@@ -26725 +26464 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1320 build/trans_style.java:1328
+#: build/trans_style.java:1335 build/trans_style.java:1343
 msgid "aeroway_dark"
 msgstr ""
@@ -26737 +26476 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1344
+#: build/trans_style.java:1359
 msgid "aeroway_light"
 msgstr ""
@@ -26797 +26536 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1368 build/trans_style.java:1376
-#: build/trans_style.java:1384 build/trans_style.java:1392
-#: build/trans_style.java:1400
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="pylon"/>
+#: build/trans_style.java:1383 build/trans_style.java:1391
+#: build/trans_style.java:1399 build/trans_style.java:1407
+#: build/trans_style.java:1415 build/trans_style.java:1423
 msgid "aerialway"
 msgstr "köysirata"
 
 #. color aerialway
-#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26814 +26561 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1410 build/trans_style.java:1411
+#: build/trans_style.java:1433 build/trans_style.java:1434
 msgid "piste_easy"
 msgstr ""
@@ -26827 +26574 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1419 build/trans_style.java:1420
+#: build/trans_style.java:1442 build/trans_style.java:1443
 msgid "piste_intermediate"
 msgstr ""
@@ -26840 +26587 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1428 build/trans_style.java:1429
+#: build/trans_style.java:1451 build/trans_style.java:1452
 msgid "piste_advanced"
 msgstr ""
@@ -26853 +26600 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1437 build/trans_style.java:1438
+#: build/trans_style.java:1460 build/trans_style.java:1461
 msgid "piste_expert"
 msgstr ""
@@ -26866 +26613 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1446 build/trans_style.java:1447
+#: build/trans_style.java:1469 build/trans_style.java:1470
 msgid "piste_freeride"
 msgstr ""
@@ -26879 +26626 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1455 build/trans_style.java:1456
+#: build/trans_style.java:1478 build/trans_style.java:1479
 msgid "piste_novice"
 msgstr ""
@@ -26997 +26744 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1467 build/trans_style.java:1481
-#: build/trans_style.java:1489 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538 build/trans_style.java:1546
-#: build/trans_style.java:1554 build/trans_style.java:1562
-#: build/trans_style.java:1570
+#: build/trans_style.java:1490 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1521
+#: build/trans_style.java:1529 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1553
+#: build/trans_style.java:1561 build/trans_style.java:1569
+#: build/trans_style.java:1577 build/trans_style.java:1585
+#: build/trans_style.java:1593
 msgid "power"
 msgstr ""
@@ -27015 +26762 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1611 build/trans_style.java:1612
+#: build/trans_style.java:1634 build/trans_style.java:1635
 msgid "pier"
 msgstr "laituri"
@@ -27027 +26774 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1620
+#: build/trans_style.java:1643
 msgid "pipeline"
 msgstr ""
@@ -27169 +26916 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742 build/trans_style.java:1750
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1830 build/trans_style.java:1838
-#: build/trans_style.java:1846
+#: build/trans_style.java:1741 build/trans_style.java:1749
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1797 build/trans_style.java:1805
+#: build/trans_style.java:1813 build/trans_style.java:1821
+#: build/trans_style.java:1829 build/trans_style.java:1837
+#: build/trans_style.java:1845 build/trans_style.java:1853
+#: build/trans_style.java:1861 build/trans_style.java:1869
+#: build/trans_style.java:1877
 msgid "leisure"
 msgstr ""
@@ -27189 +26936 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1758
+#: build/trans_style.java:1789
 msgid "marina"
 msgstr ""
@@ -27283 +27030 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904 build/trans_style.java:1912
-#: build/trans_style.java:1920 build/trans_style.java:1928
-#: build/trans_style.java:1936
+#: build/trans_style.java:1887 build/trans_style.java:1895
+#: build/trans_style.java:1903 build/trans_style.java:1911
+#: build/trans_style.java:1919 build/trans_style.java:1927
+#: build/trans_style.java:1935 build/trans_style.java:1943
+#: build/trans_style.java:1951 build/trans_style.java:1959
+#: build/trans_style.java:1967
 msgid "amenity"
 msgstr ""
@@ -27388 +27135 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008 build/trans_style.java:2015
-#: build/trans_style.java:2024 build/trans_style.java:2032
+#: build/trans_style.java:1975 build/trans_style.java:1983
+#: build/trans_style.java:1991 build/trans_style.java:1999
+#: build/trans_style.java:2007 build/trans_style.java:2015
+#: build/trans_style.java:2023 build/trans_style.java:2031
+#: build/trans_style.java:2039 build/trans_style.java:2046
+#: build/trans_style.java:2055 build/trans_style.java:2063
 msgid "amenity_traffic"
 msgstr ""
@@ -27821 +27568 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2047 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2093 build/trans_style.java:2101
-#: build/trans_style.java:2109 build/trans_style.java:2117
-#: build/trans_style.java:2232 build/trans_style.java:2240
-#: build/trans_style.java:2247 build/trans_style.java:2256
-#: build/trans_style.java:2264 build/trans_style.java:2272
-#: build/trans_style.java:2280 build/trans_style.java:2288
-#: build/trans_style.java:2296 build/trans_style.java:2304
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2407
-#: build/trans_style.java:2415 build/trans_style.java:2423
-#: build/trans_style.java:2431 build/trans_style.java:2439
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2471
-#: build/trans_style.java:2479 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2512 build/trans_style.java:2527
+#: build/trans_style.java:2078 build/trans_style.java:2093
+#: build/trans_style.java:2101 build/trans_style.java:2109
+#: build/trans_style.java:2124 build/trans_style.java:2132
+#: build/trans_style.java:2140 build/trans_style.java:2148
+#: build/trans_style.java:2263 build/trans_style.java:2271
+#: build/trans_style.java:2278 build/trans_style.java:2287
+#: build/trans_style.java:2295 build/trans_style.java:2303
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2335
+#: build/trans_style.java:2398 build/trans_style.java:2406
+#: build/trans_style.java:2414 build/trans_style.java:2423
+#: build/trans_style.java:2431 build/trans_style.java:2438
+#: build/trans_style.java:2446 build/trans_style.java:2454
+#: build/trans_style.java:2462 build/trans_style.java:2470
+#: build/trans_style.java:2478 build/trans_style.java:2486
+#: build/trans_style.java:2494 build/trans_style.java:2502
+#: build/trans_style.java:2510 build/trans_style.java:2518
+#: build/trans_style.java:2526 build/trans_style.java:2534
+#: build/trans_style.java:2543 build/trans_style.java:2558
 msgid "amenity_light"
 msgstr ""
@@ -27869 +27616 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2125 build/trans_style.java:2133
-#: build/trans_style.java:3372
+#: build/trans_style.java:2156 build/trans_style.java:2164
+#: build/trans_style.java:3403
 msgid "light_water"
 msgstr ""
@@ -27929 +27676 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2343 build/trans_style.java:2351
-#: build/trans_style.java:2359
+#: build/trans_style.java:2342 build/trans_style.java:2350
+#: build/trans_style.java:2358 build/trans_style.java:2367
+#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2390
 msgid "health"
 msgstr ""
@@ -28283 +28030 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2537 build/trans_style.java:2545
-#: build/trans_style.java:2553 build/trans_style.java:2561
-#: build/trans_style.java:2569 build/trans_style.java:2577
-#: build/trans_style.java:2585 build/trans_style.java:2593
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 build/trans_style.java:2625
-#: build/trans_style.java:2633 build/trans_style.java:2641
-#: build/trans_style.java:2649 build/trans_style.java:2657
-#: build/trans_style.java:2665 build/trans_style.java:2673
-#: build/trans_style.java:2681 build/trans_style.java:2689
-#: build/trans_style.java:2697 build/trans_style.java:2705
-#: build/trans_style.java:2713 build/trans_style.java:2721
-#: build/trans_style.java:2729 build/trans_style.java:2737
-#: build/trans_style.java:2745 build/trans_style.java:2753
-#: build/trans_style.java:2761 build/trans_style.java:2769
-#: build/trans_style.java:2777 build/trans_style.java:2785
-#: build/trans_style.java:2793 build/trans_style.java:2801
-#: build/trans_style.java:2809 build/trans_style.java:2817
-#: build/trans_style.java:2825 build/trans_style.java:2833
-#: build/trans_style.java:2841 build/trans_style.java:2849
-#: build/trans_style.java:2857 build/trans_style.java:2865
-#: build/trans_style.java:2874
+#: build/trans_style.java:2568 build/trans_style.java:2576
+#: build/trans_style.java:2584 build/trans_style.java:2592
+#: build/trans_style.java:2600 build/trans_style.java:2608
+#: build/trans_style.java:2616 build/trans_style.java:2624
+#: build/trans_style.java:2632 build/trans_style.java:2640
+#: build/trans_style.java:2648 build/trans_style.java:2656
+#: build/trans_style.java:2664 build/trans_style.java:2672
+#: build/trans_style.java:2680 build/trans_style.java:2688
+#: build/trans_style.java:2696 build/trans_style.java:2704
+#: build/trans_style.java:2712 build/trans_style.java:2720
+#: build/trans_style.java:2728 build/trans_style.java:2736
+#: build/trans_style.java:2744 build/trans_style.java:2752
+#: build/trans_style.java:2760 build/trans_style.java:2768
+#: build/trans_style.java:2776 build/trans_style.java:2784
+#: build/trans_style.java:2792 build/trans_style.java:2800
+#: build/trans_style.java:2808 build/trans_style.java:2816
+#: build/trans_style.java:2824 build/trans_style.java:2832
+#: build/trans_style.java:2840 build/trans_style.java:2848
+#: build/trans_style.java:2856 build/trans_style.java:2864
+#: build/trans_style.java:2872 build/trans_style.java:2880
+#: build/trans_style.java:2888 build/trans_style.java:2896
+#: build/trans_style.java:2905
 msgid "shop"
 msgstr "kauppa"
@@ -28374 +28121 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2884 build/trans_style.java:2892
-#: build/trans_style.java:2900 build/trans_style.java:2908
-#: build/trans_style.java:2916 build/trans_style.java:2924
-#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2915 build/trans_style.java:2923
+#: build/trans_style.java:2931 build/trans_style.java:2939
+#: build/trans_style.java:2947 build/trans_style.java:2955
+#: build/trans_style.java:2963 build/trans_style.java:2971
 msgid "hotel"
 msgstr "hotelli"
@@ -28476 +28223 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2989 build/trans_style.java:2997
-#: build/trans_style.java:3013 build/trans_style.java:3035
+#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2995 build/trans_style.java:3003
+#: build/trans_style.java:3011 build/trans_style.java:3019
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3044 build/trans_style.java:3066
 msgid "tourism"
 msgstr "turismi"
@@ -28566 +28313 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3045 build/trans_style.java:3053
-#: build/trans_style.java:3061 build/trans_style.java:3069
-#: build/trans_style.java:3077 build/trans_style.java:3085
-#: build/trans_style.java:3093 build/trans_style.java:3101
-#: build/trans_style.java:3109 build/trans_style.java:3117
+#: build/trans_style.java:3076 build/trans_style.java:3084
+#: build/trans_style.java:3092 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3140 build/trans_style.java:3148
 msgid "historic"
 msgstr "historiallinen"
@@ -28581 +28328 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3165
+#: build/trans_style.java:3196
 msgid "quarry"
 msgstr "louhos"
@@ -28593 +28340 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3173
+#: build/trans_style.java:3204
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -28613 +28360 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "basin"
 msgstr "valuma-alue"
@@ -28625 +28372 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3197
+#: build/trans_style.java:3228
 msgid "forest"
 msgstr "talousmetsä"
@@ -28637 +28384 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3260
 msgid "farmyard"
 msgstr ""
@@ -28658 +28405 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3238 build/trans_style.java:3246
+#: build/trans_style.java:3269 build/trans_style.java:3277
 msgid "retail"
 msgstr "kaupallinen"
@@ -28670 +28417 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3254
+#: build/trans_style.java:3285
 msgid "industrial"
 msgstr "teollisuus"
@@ -28682 +28429 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3262
+#: build/trans_style.java:3293
 msgid "brownfield"
 msgstr ""
@@ -28694 +28441 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3270
+#: build/trans_style.java:3301
 msgid "greenfield"
 msgstr ""
@@ -28706 +28453 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3309
 msgid "railland"
 msgstr "rata-alue"
@@ -28761 +28508 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3295 build/trans_style.java:3330
-#: build/trans_style.java:3338 build/trans_style.java:3346
-#: build/trans_style.java:3354 build/trans_style.java:3362
+#: build/trans_style.java:3326 build/trans_style.java:3361
+#: build/trans_style.java:3369 build/trans_style.java:3377
+#: build/trans_style.java:3385 build/trans_style.java:3393
 msgid "military"
 msgstr "armeija"
@@ -28775 +28522 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3303
+#: build/trans_style.java:3334
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -28786 +28533 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3379
+#: build/trans_style.java:3410
 msgid "peak"
 msgstr "huippu"
@@ -28799 +28546 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3388
+#: build/trans_style.java:3419
 msgid "glacier"
 msgstr "jäätikkö"
@@ -28811 +28558 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3396
+#: build/trans_style.java:3427
 msgid "volcano"
 msgstr "tulivuori"
@@ -28864 +28611 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3404 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3429
-#: build/trans_style.java:3493 build/trans_style.java:3501
-#: build/trans_style.java:3509
+#: build/trans_style.java:3435 build/trans_style.java:3436
+#: build/trans_style.java:3444 build/trans_style.java:3460
+#: build/trans_style.java:3524 build/trans_style.java:3532
+#: build/trans_style.java:3540
 msgid "natural"
 msgstr ""
@@ -28879 +28626 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3421
+#: build/trans_style.java:3452
 msgid "scrub"
 msgstr "pusikko"
@@ -28891 +28638 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3437
+#: build/trans_style.java:3468
 msgid "heath"
 msgstr "nummi"
@@ -28903 +28650 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3445
+#: build/trans_style.java:3476
 msgid "woodarea"
 msgstr ""
@@ -28915 +28662 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3477
+#: build/trans_style.java:3508
 msgid "mud"
 msgstr "muta"
@@ -28927 +28674 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3516
 msgid "beach"
 msgstr "ranta"
@@ -29003 +28750 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3525 build/trans_style.java:3533
-#: build/trans_style.java:3541 build/trans_style.java:3549
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573 build/trans_style.java:3581
+#: build/trans_style.java:3556 build/trans_style.java:3564
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
 msgid "route"
 msgstr "reitti"
@@ -29093 +28840 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3591 build/trans_style.java:3599
-#: build/trans_style.java:3603 build/trans_style.java:3607
-#: build/trans_style.java:3611 build/trans_style.java:3615
-#: build/trans_style.java:3619 build/trans_style.java:3623
-#: build/trans_style.java:3627 build/trans_style.java:3631
-#: build/trans_style.java:3635 build/trans_style.java:3640
-#: build/trans_style.java:3648 build/trans_style.java:3656
-#: build/trans_style.java:3664
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3634 build/trans_style.java:3638
+#: build/trans_style.java:3642 build/trans_style.java:3646
+#: build/trans_style.java:3650 build/trans_style.java:3654
+#: build/trans_style.java:3658 build/trans_style.java:3662
+#: build/trans_style.java:3666 build/trans_style.java:3671
+#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3695
 msgid "boundary"
 msgstr "raja"
@@ -29248 +28995 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4104 build/trans_style.java:4112
-#: build/trans_style.java:4120 build/trans_style.java:4128
-#: build/trans_style.java:4136 build/trans_style.java:4144
-#: build/trans_style.java:4152 build/trans_style.java:4160
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231
 msgid "place"
 msgstr ""
@@ -29300 +29047 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4289 build/trans_style.java:4296
-#: build/trans_style.java:4303 build/trans_style.java:4310
+#: build/trans_style.java:4320 build/trans_style.java:4327
+#: build/trans_style.java:4334 build/trans_style.java:4341
 msgid "address"
 msgstr "osoite"
@@ -29654 +29401 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
+
+#~ msgid "Bridleway"
+#~ msgstr "Ratsastustie"
+
+#~ msgid "Cycleway"
+#~ msgstr "Pyörätie"
+
+#~ msgid "Footway"
+#~ msgstr "Jalankulkutie"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+
+#~ 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?"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Avoin"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Suljettu"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "kuva"
+#~ msgstr[1] "kuvat"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
 
 #~ msgid "Unknown version"
@@ -30145 +29939 @@
 #~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
 
-#~ 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 "Cannot open preferences directory: {0}"
 #~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
@@ -30192 +29981 @@
 
 #~ msgid "Merge Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "Combine Anyway"
 #~ msgstr "Yhdistä silti"