Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 22465)
+++ applications/editors/josm/i18n/po/fi.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-21 15:47+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 11:51+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Yhdistä"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Ladataan avonaiset muutoskokoelmat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Yhdistä polkuja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Yhdistää monta polkua yhdeksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Vaihdetaanko suuntia?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -603,5 +604,5 @@
 "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -610,10 +611,10 @@
 "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
@@ -660,10 +661,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -801,5 +802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -865,10 +866,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1497,20 +1498,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1534,5 +1535,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1543,6 +1544,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Virhe"
@@ -1569,5 +1570,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1575,5 +1576,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Tallenna tämänhetkinen data."
@@ -1630,10 +1631,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Tallenna data uuteen tiedostoon."
@@ -1678,5 +1679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1703,5 +1704,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ei, peruuta"
@@ -1770,18 +1771,24 @@
 msgstr[1] "Yksinkertaista polku (poista {0} pistettä)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Katkaise polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Valintaa ei voida käyttää jakamiseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Valitut pisteet eivät ole samalla polulla."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1789,5 +1796,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1803,20 +1810,10 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Valitut pisteet eivät ole samalla polulla."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-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/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1826,5 +1823,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1834,5 +1831,5 @@
 "<br>Sinun tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1842,5 +1839,5 @@
 "tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1992,5 +1989,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3024,22 +3021,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3185,25 +3182,25 @@
 msgstr "Ristiriitaa ei voi ratkaista, koska päätös puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Pitäisi olla ainakin yksi poistettava kohde, saatiin tyhjä kokoelma"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Poista piste {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Poista polku {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Poistetaan relaatio {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3212,5 +3209,5 @@
 msgstr[1] "Poista {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3219,5 +3216,5 @@
 msgstr[1] "Poista {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3226,5 +3223,5 @@
 msgstr[1] "Poista {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3233,5 +3230,5 @@
 msgstr[1] "Poistetaan {0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3388,5 +3385,5 @@
 msgstr "Toteutav"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3471,7 +3468,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Virhe luotaessa välimuistihakemistoa: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3666,42 +3663,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Asteina, minuutteina ja sekunteina"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Projisoidut koordinaatit"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "E"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "P"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "L"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3709,5 +3709,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3886,5 +3886,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "tausta"
@@ -4032,5 +4032,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Älä näytä uudestaan (muistaa valinnan)"
@@ -4058,5 +4058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "rata"
@@ -4078,6 +4078,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4146,5 +4146,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "rakennus"
@@ -4231,5 +4231,5 @@
 msgstr "Objekti poistettu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4330,69 +4330,69 @@
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "UNIX-standardin mukainen geometria"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Lataa rajattu alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Avaa tiedosto (mitä tahansa Tiedosto/Avaa-valikon tuntemaa tyyppiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Lataa rajattu alue raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z) raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Valitse haun tulokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Käynnistä suurennettuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Aseta kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/polku/josmin/hakemistoon/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Vaihda kaikkien käyttäjäasetuksien kansio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4405,9 +4405,9 @@
 "Java-asetus, joka määrää suurimman käytettävän muistimäärän megatavuina."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4417,46 +4417,45 @@
 "järjestyksessä."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Muista ladata dataa, jos käytät --selection-valitsinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Päivitetään liitännäisiä..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Asennetaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Ladataan liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Selvitä"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4465,5 +4464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4559,33 +4558,33 @@
 msgstr "Loitonna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4595,9 +4594,9 @@
 "nappia pohjassa.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4613,4 +4612,18 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Tason \"{0}\" tulee olla tasolistassa"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kiinalainen"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Toimistoalue"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5356,5 +5369,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "kaikki"
@@ -5437,6 +5450,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5447,5 +5460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5589,5 +5602,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Muutoskokoelmat"
@@ -5649,5 +5662,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5806,5 +5819,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5812,5 +5825,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5818,5 +5831,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5824,5 +5837,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5830,5 +5843,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5837,5 +5850,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5843,5 +5856,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5849,5 +5862,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5855,24 +5868,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Suodatus päällä</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> kohdetta piilossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> kohdetta himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5953,51 +5966,51 @@
 msgstr "Sulje ikkuna luomatta uutta pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Poista valitut tasot."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Näytä/piilota valittu taso."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Näytä/piilota valittu taso."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivoi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktivoi valittu taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Yhdistä tämä taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Monista tämä taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 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:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Tietoja tasosta"
@@ -6007,5 +6020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relaatiot"
@@ -7162,6 +7175,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7209,107 +7223,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nimi"
@@ -7648,5 +7662,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7733,5 +7747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<eri>"
@@ -8489,5 +8503,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8560,8 +8574,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tyyppi"
@@ -8590,6 +8604,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "tuntematon"
@@ -8923,5 +8937,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Ristiriitoja"
@@ -8992,14 +9006,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Virheellinen kommentti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Muutoskokoleman id:"
@@ -9439,5 +9454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Lähetä"
@@ -9459,5 +9474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9465,60 +9480,93 @@
 msgstr "Asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Uuden muutoskokoelman tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Muuta lisäasetuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Virheellinen kommentti"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Käännä järjestys"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Jatka"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Älä näytä uudelleen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Peruuta lähetys ja jatka muokkausta"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9858,103 +9906,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Muokkaa viivanpiirtotyyliä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Käytä globaaleja asetuksia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Muokkaa väriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Oletusarvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Valitse väri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Tuo äänitiedosto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<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:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Ääniaaltotiedostot (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Tuo kuvia"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<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:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9962,5 +9918,5 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9968,5 +9924,5 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9976,23 +9932,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10001,5 +9957,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10008,10 +9964,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10021,21 +9977,21 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10043,10 +9999,10 @@
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10054,10 +10010,10 @@
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10065,21 +10021,21 @@
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10089,9 +10045,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 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:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10099,5 +10055,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10105,23 +10061,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Muokkaa viivanpiirtotyyliä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Käytä globaaleja asetuksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Viivanpiirtoasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Muokkaa väriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Oletusarvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Valitse väri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Tuo äänitiedosto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<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:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Ääniaaltotiedostot (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Tuo kuvia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<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/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10130,11 +10178,11 @@
 msgstr[1] "Havaittiin {0} ristiriitaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10143,36 +10191,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10182,5 +10230,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10189,5 +10237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10195,5 +10243,5 @@
 msgstr[1] "pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10202,5 +10250,5 @@
 msgstr[1] "jälki, jossa on {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10209,5 +10257,5 @@
 msgstr[1] "{0}:ssä on {1} jälkeä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10216,24 +10264,28 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Sijoittele GPX-tiedoston mukaisesti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Virhe tulkittaessa {0}:aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10244,34 +10296,34 @@
 "kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS:n aika (lue ylläolevasta kuvasta): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [pp/kk/vvvv tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10281,93 +10333,93 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10377,20 +10429,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10399,5 +10451,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10405,21 +10457,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10428,17 +10480,17 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10447,5 +10499,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10454,56 +10506,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Sijoittele GPX-tiedoston mukaisesti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10512,5 +10560,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10519,10 +10567,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10531,5 +10579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10629,9 +10677,9 @@
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10639,5 +10687,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10646,14 +10694,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10661,29 +10721,17 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11528,4 +11576,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ei mitään"
@@ -11540,5 +11589,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
@@ -11641,5 +11690,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
@@ -11647,5 +11696,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
@@ -11675,5 +11724,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Tekijä"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Vene"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11681,9 +11744,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11693,9 +11756,9 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11704,20 +11767,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11725,5 +11788,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11731,13 +11794,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11747,9 +11810,9 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11757,37 +11820,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint-kuva"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11795,9 +11867,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12153,21 +12225,26 @@
 "käyttöön."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projektiometodi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Näytä koordinaatit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projektiometodi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Taso, jolla tehdään mittaukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Karttaprojektio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12718,5 +12795,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12725,49 +12802,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12777,15 +12854,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12795,17 +12872,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12823,7 +12900,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Etsi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12832,17 +12908,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Etsi kohteita."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Sovita näkymä valintaan"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Etsi kohteita."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13143,5 +13216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
@@ -14612,5 +14685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14879,5 +14952,5 @@
 #: ../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:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15219,41 +15292,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15270,25 +15343,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15326,18 +15399,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Rakennukset"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15561,8 +15634,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vesi"
@@ -15623,6 +15696,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "osoite"
@@ -16088,34 +16161,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16124,14 +16197,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16208,22 +16281,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Lataa objekti..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Lataa valittujen relaatioiden kaikki jäsenet"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Lataa nyt"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Valitse vähintään yksi ladattava tietolaji."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16233,12 +16302,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Testi {0}/{1}: Aloitetaan {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Ladataan {0}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16269,9 +16338,9 @@
 msgstr "Luo kopio polusta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16281,5 +16350,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16288,11 +16357,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Tuo jälki GPX-tasolta"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Poista olemassa oleva jälki"
@@ -16302,5 +16371,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "GPX-tasoa ei löytynyt."
@@ -16310,13 +16379,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16555,5 +16624,5 @@
 msgstr "Näytä kuvat, joita ei ole geo-merkitty"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Tuodut kuvat"
@@ -16912,8 +16981,6 @@
 msgstr "Avaa mittausikkuna."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Nollaa"
@@ -16944,5 +17011,5 @@
 msgstr "Kahden pisteen välinen kulma"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Taso, jolla tehdään mittaukset"
@@ -17034,5 +17101,5 @@
 msgstr "OpenStreetBugs-latauslooppi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Näyttä OpenStreetBugs-ongelmat"
@@ -17100,13 +17167,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17220,93 +17287,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17348,9 +17415,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17528,20 +17595,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Yhdistetty versio"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Etähallinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Asetukset etähallintaliitännäiselle."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17552,50 +17624,58 @@
 "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Varmista etähallinnan toimenpide"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17603,5 +17683,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Palauta"
@@ -17800,41 +17880,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -18134,4 +18214,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Erotin"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18818,6 +18908,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18827,9 +18917,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18908,6 +18998,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18915,5 +19005,5 @@
 msgstr "Tarkistusvirheet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Ei virheitä"
@@ -19156,32 +19246,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19218,5 +19302,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19747,5 +19831,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "alue"
@@ -19883,10 +19967,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20032,10 +20116,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20221,28 +20305,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automaattinen lataus"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20253,17 +20333,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20272,48 +20352,52 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automaattinen lataus"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20392,5 +20476,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20425,5 +20509,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20444,5 +20528,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "talousmetsä"
@@ -20461,22 +20545,19 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "raja"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Mittaukset"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Putki"
+msgstr ""
 
 #. relation type
@@ -20488,43 +20569,37 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Taideteos"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "julkinen liikenne"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Kielto"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "reitti"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Liitä"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vesiväylä"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20798,7 +20873,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20995,6 +21069,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21003,5 +21082,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21010,5 +21089,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21017,10 +21096,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21029,5 +21108,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21037,5 +21116,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21044,15 +21123,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21061,5 +21140,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21192,5 +21271,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Numero"
@@ -21729,5 +21808,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21740,5 +21819,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "metsä"
@@ -22042,9 +22121,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "kyllä"
@@ -22154,9 +22233,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ei"
@@ -22415,5 +22494,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "asuinkatu"
@@ -22462,5 +22541,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22495,5 +22574,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22580,5 +22659,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22613,5 +22692,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22781,14 +22860,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operaattori"
@@ -23056,6 +23135,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Korkeus"
@@ -23503,5 +23582,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "suo"
@@ -23907,5 +23986,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Jännite"
@@ -24269,31 +24348,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -24353,90 +24432,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24549,7 +24628,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24565,5 +24644,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "maanalainen"
@@ -24576,6 +24655,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Maksu"
@@ -24751,5 +24830,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -24786,6 +24865,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24793,5 +24872,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Penkki"
@@ -24910,5 +24989,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Loisto"
@@ -25069,5 +25148,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -25075,73 +25154,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -25149,17 +25233,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kahvila"
@@ -25167,9 +25251,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr ""
@@ -25177,18 +25261,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -25196,9 +25281,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -25206,24 +25291,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museo"
@@ -25231,9 +25316,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -25242,9 +25327,9 @@
 #. <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:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -25252,24 +25337,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Taideteos"
@@ -25277,5 +25362,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr ""
@@ -25283,19 +25368,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25333,5 +25418,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25339,28 +25424,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25370,5 +25455,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25376,5 +25461,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -25382,6 +25467,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -25389,5 +25474,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25395,6 +25480,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr ""
@@ -25402,5 +25487,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25408,46 +25493,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25455,29 +25547,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25485,25 +25577,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Linna"
@@ -25512,19 +25604,19 @@
 #. <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:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -25533,9 +25625,9 @@
 #. <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:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -25543,10 +25635,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25554,5 +25646,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25560,15 +25652,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -25576,55 +25668,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -25632,35 +25724,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Liikunta"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Liikuntapaikka"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -25674,6 +25766,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -26089,31 +26181,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: 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_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: 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_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098 build/trans_style.java:4106
+#: build/trans_style.java:4114 build/trans_style.java:4122
+#: build/trans_style.java:4130 build/trans_style.java:4138
 msgid "sport"
 msgstr "urheilu"
@@ -26123,240 +26215,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskusta"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -26398,23 +26490,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tyyppi"
@@ -26456,211 +26548,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr ""
@@ -26668,52 +26760,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Ammunta"
@@ -26721,204 +26813,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Keinotekoiset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Rakennus"
@@ -26926,5 +27018,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -26932,10 +27024,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -26943,10 +27035,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -26954,10 +27046,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -26966,10 +27058,10 @@
 #. <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:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Vankila"
@@ -26978,10 +27070,10 @@
 #. <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:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Poliisiasema"
@@ -26991,10 +27083,10 @@
 #. 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:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -27003,10 +27095,10 @@
 #. <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:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -27014,5 +27106,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -27020,15 +27112,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Koulu"
@@ -27036,10 +27128,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Yliopisto"
@@ -27047,10 +27139,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Korkeakoulu"
@@ -27058,5 +27150,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -27064,5 +27156,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -27071,10 +27163,10 @@
 #. <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:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Kirjasto"
@@ -27083,9 +27175,9 @@
 #. <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:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -27093,10 +27185,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatteri"
@@ -27105,10 +27197,10 @@
 #. <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:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr ""
@@ -27118,5 +27210,5 @@
 #. 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:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr ""
@@ -27125,6 +27217,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Uskonto"
@@ -27133,66 +27225,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -27201,81 +27293,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -27284,5 +27376,5 @@
 #. <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:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -27290,5 +27382,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Talon numero"
@@ -27296,25 +27388,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Maakoodi"
@@ -27323,5 +27415,5 @@
 #. <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:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -27329,61 +27421,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27391,25 +27483,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -27417,10 +27509,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -27428,10 +27520,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Putki"
@@ -27440,41 +27532,41 @@
 #. <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:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -27484,10 +27576,10 @@
 #. 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:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Nosturi"
@@ -27495,5 +27587,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
@@ -27501,10 +27593,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27512,10 +27604,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -27523,23 +27615,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr ""
@@ -27549,35 +27641,35 @@
 #. 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:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr ""
@@ -27586,10 +27678,10 @@
 #. <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:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -27598,5 +27690,5 @@
 #. <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:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -27604,10 +27696,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -27618,23 +27710,23 @@
 #. 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:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -27643,78 +27735,76 @@
 #. <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:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Putki"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "moottoritien_ramppi"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 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:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Puhelin"
@@ -27723,5 +27813,5 @@
 #. <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:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -27729,5 +27819,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Kolikot"
@@ -27735,5 +27825,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr ""
@@ -27741,5 +27831,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27747,5 +27837,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27753,15 +27843,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -27770,5 +27860,5 @@
 #. <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:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -27776,35 +27866,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27812,5 +27902,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27819,31 +27909,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27922,39 +28012,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -27963,30 +28053,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Lähde"
@@ -27995,10 +28085,10 @@
 #. <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:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -28007,10 +28097,10 @@
 #. <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:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -28019,5 +28109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28025,5 +28115,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -28031,15 +28121,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -28047,10 +28137,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -28059,28 +28149,28 @@
 #. <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:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -28088,9 +28178,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kioski"
@@ -28098,27 +28188,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Matkatoimisto"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Muokkaa matkatoimistoa"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -28126,9 +28216,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Leipomo"
@@ -28136,9 +28226,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr ""
@@ -28146,18 +28236,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -28165,54 +28255,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -28220,9 +28310,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -28230,9 +28320,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -28240,54 +28330,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -28295,9 +28385,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Pesula"
@@ -28305,9 +28395,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -28315,24 +28405,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Muokkaa urheiluvälinekauppaa"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -28340,5 +28430,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -28346,97 +28436,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "julkisen liikenteen lippuja"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "julkisen liikenteen aikatauluja"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Pankki"
@@ -28444,14 +28534,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -28459,5 +28549,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -28465,15 +28555,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -28481,18 +28571,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -28500,5 +28590,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -28506,9 +28596,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Sairaala"
@@ -28516,10 +28606,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28528,5 +28618,5 @@
 #. <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:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28535,20 +28625,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28556,5 +28646,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -28563,64 +28653,64 @@
 #. <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:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Maantiede"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28628,15 +28718,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Suurkaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Muokkaa suurkaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Kaupunki"
@@ -28644,10 +28734,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -28655,25 +28745,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -28681,5 +28771,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28687,10 +28777,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Saari"
@@ -28698,10 +28788,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28709,5 +28799,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28715,5 +28805,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -28721,10 +28811,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Huippu"
@@ -28732,10 +28822,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -28743,10 +28833,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -28754,70 +28844,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Puu"
@@ -28826,15 +28916,15 @@
 #. <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:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Metsä"
@@ -28843,5 +28933,5 @@
 #. <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:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -28849,17 +28939,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -28868,14 +28958,14 @@
 #. <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:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28883,25 +28973,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Tunturi"
@@ -28909,10 +28999,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Nummi"
@@ -28920,5 +29010,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -28926,5 +29016,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -28933,45 +29023,45 @@
 #. <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:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -28979,25 +29069,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29005,10 +29095,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -29016,20 +29106,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -29037,5 +29127,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29043,15 +29133,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -29059,9 +29149,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -29069,39 +29159,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -29109,15 +29199,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -29125,50 +29215,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -29178,5 +29268,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29188,5 +29278,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -29194,5 +29284,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -29200,5 +29290,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29209,5 +29299,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29215,36 +29305,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29252,5 +29342,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -29259,5 +29349,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29265,34 +29355,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -29301,15 +29391,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -29317,5 +29407,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -29324,5 +29414,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -29330,5 +29420,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29436,5 +29526,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29445,17 +29535,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29523,5 +29613,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29531,9 +29621,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29547,10 +29637,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29558,31 +29648,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29591,30 +29681,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29841,5 +29931,5 @@
 #: 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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30492,4 +30582,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30593,11 +30691,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -31110,5 +31208,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "laituri"
@@ -31122,5 +31220,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -31264,13 +31362,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: 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:1822 build/trans_style.java:1830
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902
+#: 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:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "leisure"
 msgstr ""
@@ -31284,5 +31382,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -31378,10 +31476,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: 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:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 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
 msgid "amenity"
 msgstr ""
@@ -31483,10 +31581,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 build/trans_style.java:2016
+#: build/trans_style.java:2024 build/trans_style.java:2032
+#: build/trans_style.java:2040 build/trans_style.java:2048
+#: build/trans_style.java:2056 build/trans_style.java:2064
+#: build/trans_style.java:2072 build/trans_style.java:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31924,24 +32022,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 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:2511
-#: build/trans_style.java:2519 build/trans_style.java:2527
-#: build/trans_style.java:2535 build/trans_style.java:2543
-#: build/trans_style.java:2551 build/trans_style.java:2559
-#: build/trans_style.java:2567 build/trans_style.java:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2352
+#: build/trans_style.java:2360 build/trans_style.java:2368
+#: build/trans_style.java:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 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:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31973,6 +32071,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -32033,8 +32131,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -32387,26 +32485,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: 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:2873 build/trans_style.java:2881
-#: build/trans_style.java:2889 build/trans_style.java:2897
-#: build/trans_style.java:2905 build/trans_style.java:2913
-#: build/trans_style.java:2921 build/trans_style.java:2929
-#: build/trans_style.java:2938
+#: 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:2873
+#: build/trans_style.java:2881 build/trans_style.java:2889
+#: build/trans_style.java:2897 build/trans_style.java:2905
+#: build/trans_style.java:2913 build/trans_style.java:2921
+#: build/trans_style.java:2929 build/trans_style.java:2937
+#: build/trans_style.java:2946
 msgid "shop"
 msgstr "kauppa"
@@ -32478,8 +32576,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.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:2996 build/trans_style.java:3004
+#: 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:2996
+#: build/trans_style.java:3004 build/trans_style.java:3012
 msgid "hotel"
 msgstr "hotelli"
@@ -32580,9 +32678,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismi"
@@ -32670,9 +32768,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
+#: build/trans_style.java:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 build/trans_style.java:3141
+#: build/trans_style.java:3149 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
 msgid "historic"
 msgstr "historiallinen"
@@ -32685,5 +32783,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "louhos"
@@ -32697,5 +32795,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -32717,5 +32815,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "valuma-alue"
@@ -32729,5 +32827,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32750,5 +32848,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "kaupallinen"
@@ -32762,5 +32860,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "teollisuus"
@@ -32774,5 +32872,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32786,5 +32884,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32798,5 +32896,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "rata-alue"
@@ -32853,7 +32951,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "armeija"
@@ -32867,5 +32965,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -32878,5 +32976,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "huippu"
@@ -32891,5 +32989,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "jäätikkö"
@@ -32903,5 +33001,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "tulivuori"
@@ -32956,8 +33054,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32971,5 +33069,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "pusikko"
@@ -32983,5 +33081,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "nummi"
@@ -32995,5 +33093,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -33007,5 +33105,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "muta"
@@ -33019,5 +33117,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "ranta"
@@ -33095,8 +33193,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "reitti"
@@ -33185,12 +33283,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "raja"
@@ -33340,11 +33438,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288
+#: build/trans_style.java:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 build/trans_style.java:4240
+#: build/trans_style.java:4248 build/trans_style.java:4256
+#: build/trans_style.java:4264 build/trans_style.java:4272
+#: build/trans_style.java:4280 build/trans_style.java:4288
+#: build/trans_style.java:4296
 msgid "place"
 msgstr ""
@@ -33358,5 +33456,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33712,4 +33810,18 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valittu polku ei sisällä valittua pistettä."
+#~ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Asteina, minuutteina ja sekunteina"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -33776,7 +33888,4 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
 
 #~ msgid "Error parsing server response."
@@ -34081,7 +34190,4 @@
 #~ msgstr[1] ""
 #~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#~ msgid "Boat"
-#~ msgstr "Vene"
 
 #~ msgid "Motorboat"
