Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 19557)
+++ applications/editors/josm/i18n/po/fi.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 00:59-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:42+0000\n"
 "Last-Translator: Matti Kujala <oh1qt@sral.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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -249,13 +249,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -264,5 +264,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -288,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Yhdistä"
@@ -317,5 +320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -382,9 +385,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -392,5 +395,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -441,6 +446,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -458,5 +463,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -465,11 +470,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -506,5 +511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "ristiriita"
@@ -637,14 +642,14 @@
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopioi valitut objektit leikepöydälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Valitse jotain kopioitavaksi."
@@ -676,8 +681,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -686,5 +691,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -741,16 +746,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Tuonnin aikana oli {0} konfliktia."
-msgstr[1] "Tuonnin aikana oli {0} konfliktia."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikti latauksen aikana"
-msgstr[1] "Konflikti latauksen aikana"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -771,4 +775,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../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/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -778,4 +784,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Monista valinta kopioimalla ja liittämällä samantien."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Monista polku"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Siirrä valittuja jäseniä ylöspäin"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Taso: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Sovita näkymä {0}:aan."
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -866,10 +900,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Valittu polku ei sisällä valittua pistettä."
-msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -988,5 +1021,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1138,5 +1171,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1150,9 +1183,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Avataan {0} tiedostoa..."
-msgstr[1] "Avataan {0} tiedostoa..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1208,7 +1241,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"When one or more ways are selected, the shape is adjusted such, that all "
-"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"<h3>When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
 "can undo the movement for certain nodes:<br>Select them and press the "
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
@@ -1222,5 +1255,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
 
@@ -1258,4 +1292,8 @@
 "johtaa<br>epätoivottuun tulokseen suorakulmaisessa asettelussa.<br>Muuta "
 "projektiota päästäksesi eroon tästä varoituksesta.<br>Haluatko jatkaa?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1271,4 +1309,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Valittuja objekteja ei voi suorakulmaistaa"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1285,9 +1334,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Poista keskeneräiset jäsenet?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Liitä ilman keskeneräisiä jäseniä?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1297,4 +1346,7 @@
 "incomplete primitives?"
 msgstr ""
+"Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä keskeneräiset "
+"objektit poistetaan. Haluatko varmasti liittää datan ilman keskeneräisiä "
+"objekteja?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1374,18 +1426,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1410,12 +1462,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Virhe"
@@ -1549,5 +1602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1755,9 +1808,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Monista {0} pistettä {1} pisteeksi"
-msgstr[1] "Monista {0} pistettä {1} pisteeksi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1801,5 +1854,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -1849,5 +1902,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
+msgstr "Lähetä kaikki muutokset aktiiviselta datatasolta OSM-palvelimelle"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
@@ -1965,8 +2018,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
-#, fuzzy
 msgctxt "audio"
 msgid "Next Marker"
-msgstr "Seuraava kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
@@ -1987,14 +2039,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
-#, fuzzy
 msgctxt "audio"
 msgid "Previous Marker"
-msgstr "Edellinen kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#, fuzzy
 msgctxt "audio"
 msgid "Play previous marker."
-msgstr "Edellinen kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
@@ -2034,5 +2084,5 @@
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
-msgstr ""
+msgstr "Ladataan {0}/{1} ({2} jäljellä)"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
@@ -2042,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
 msgid "Check on the server"
-msgstr ""
+msgstr "Tarkista palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2048,5 +2098,5 @@
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
-msgstr ""
+msgstr "Klikkaa tarkistaaksesi onko lataamasi objektit poistettu palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2071,5 +2121,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Poistetut tai siirretyt objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
@@ -2225,6 +2275,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2274,4 +2324,6 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+"Vapauta hiiren painike lopettaaksesi siirron. Paina ctrl-näppäintä "
+"yhdistääksesi lähimpään pisteeseen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
@@ -2284,4 +2336,7 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"Muuta valintaa; Siirrä objekteja raahaamalla; Pidä shift-näppäintä pohjassa "
+"lisätäksesi valintaan (ctrl-näppäimellä poistaa valinnasta; Pyöritä "
+"objekteja ctrl ja shift -näppäimet pohjassa raahamalla"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2303,7 +2358,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "pohjoinen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2345,5 +2399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Etsi objekteja."
@@ -2425,5 +2479,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - avain 'foot' asetettuna"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
@@ -2541,5 +2595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Etsi"
@@ -2551,5 +2605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Start Search"
-msgstr ""
+msgstr "Aloita haku"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
@@ -2571,5 +2625,5 @@
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Valinnasta ei löytynyt mitään hakusanalla \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
@@ -2579,12 +2633,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "E"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2592,10 +2645,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2608,9 +2661,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2743,9 +2796,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Lisättiin {0} objekttia"
-msgstr[1] "Lisättiin {0} objekttia"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2795,12 +2848,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Poista \"{0}\" polusta \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Aseta {0}={1} kohteelle {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2858,17 +2911,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Poistotila"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Poista {0} polku"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Poista {0} relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2914,5 +2967,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Poiston vahvistus"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
@@ -2949,9 +3002,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Lisättiin {0} objekttia"
-msgstr[1] "Lisättiin {0} objekttia"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2999,9 +3052,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "{0} objektiin"
-msgstr[1] "{0} objektiin"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -3016,7 +3069,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Poistetaanko valinta relaatiosta {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3263,5 +3316,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3269,5 +3322,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3275,5 +3328,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3281,5 +3334,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3358,15 +3411,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "WC"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "ID"
+msgstr ""
 
 #. column header: filter mode
@@ -3391,8 +3442,7 @@
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "ID"
+msgstr ""
 
 #. filter mode: in selection
@@ -3402,19 +3452,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3423,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3429,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3448,5 +3498,5 @@
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "Ei voitu lisätä pistettä {0} keskeneräiseen polkuun {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
@@ -3552,6 +3602,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3561,5 +3611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3570,7 +3620,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3592,5 +3642,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "tausta"
@@ -3615,5 +3665,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 maantieteellinen"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:220
@@ -3630,5 +3680,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
 msgid "Lambert 4 Zones (France)"
-msgstr ""
+msgstr "Lambert 4 aluetta (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:249
@@ -3646,23 +3696,23 @@
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
-msgstr ""
+msgstr "{0} ({1}-{2} astetta)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Korsika)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
 msgid "Lambert CC Zone"
-msgstr ""
+msgstr "Lambert CC-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
 msgid "Lambert CC9 Zone (France)"
-msgstr ""
+msgstr "Lambert CC9-alue (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
-msgstr ""
+msgstr "Lamber-alue (Viro)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
@@ -3672,30 +3722,30 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
-msgstr ""
+msgstr "PUWG-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 -alue {0} (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
 msgid "Swiss Grid (Switzerland)"
-msgstr ""
+msgstr "Swiss Grid (Sveitsi)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
 msgid "UTM Zone"
-msgstr ""
+msgstr "UTM-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
@@ -3713,5 +3763,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
@@ -3732,8 +3782,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+msgstr "Älä näytä uudestaan (muistaa valinnan)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3741,37 +3791,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "keskeneräinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "tie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "rata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3780,10 +3831,10 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+msgstr "julkinen liikenne"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3792,5 +3843,5 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3827,6 +3878,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Ristiriita"
@@ -3837,7 +3888,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Yhteys epäonnistui"
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4034,5 +4084,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Alustetaan"
@@ -4040,9 +4089,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Päivitetään liitännäisiä..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Asennetaan päivitetyt liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4073,5 +4122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4082,5 +4131,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Muokkaa"
@@ -4151,29 +4200,29 @@
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4181,9 +4230,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4343,9 +4392,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tagit ({0} konfliktia)"
-msgstr[1] "Tagit ({0} konfliktia)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4407,16 +4456,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4610,10 +4659,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+msgstr "Piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Yhdistää pisteet vanhimpaan."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4684,5 +4737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
 msgid "Coordinates:"
-msgstr ""
+msgstr "Koordinaatit:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
@@ -4761,5 +4814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4805,5 +4858,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4933,10 +4991,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "ei mitään"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "kaikki"
@@ -4966,7 +5024,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Valittu polku ei sisällä valittua pistettä."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5016,7 +5074,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5026,6 +5084,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5206,10 +5264,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5229,18 +5287,18 @@
 msgstr "Komentolista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Selvitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5273,5 +5331,5 @@
 "<html>You did not finish to merge the differences in this conflict."
 "<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
+"resolved.<br>Click <strong>{0}</strong> to close anyway."
 "<strong>Already<br>resolved differences will not be applied.</"
 "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
@@ -5297,5 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5304,5 +5362,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5382,43 +5440,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Monista polku"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
@@ -5432,6 +5495,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relaatiot"
@@ -5441,69 +5504,69 @@
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Tämänhetkinen valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Avaa valintaikkuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5511,5 +5574,5 @@
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5864,8 +5927,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. -->
 #. <space />
 #. <key key="highway" value="construction" />
@@ -5937,4 +5998,7 @@
 #. <space />
 #. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
 #. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
@@ -6013,6 +6077,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6054,6 +6119,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
 #. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
 #. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
@@ -6522,152 +6589,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nimi"
@@ -6735,5 +6804,5 @@
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [keskeneräinen]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
@@ -7051,5 +7120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<eri>"
@@ -7104,55 +7173,55 @@
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7222,6 +7291,6 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ladataan {0} relaation \"{1}\" keskeneräinen jäsen"
+msgstr[1] "Ladataan {0} relaation \"{1}\" keskeneräistä jäsentä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -7443,5 +7512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Lataa kaikki keskeneräiset jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
@@ -7457,5 +7526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Lataa valitut keskeneräiset jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
@@ -7479,7 +7548,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Sallitaanko tämä?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7595,47 +7663,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
 msgid "Please enter a name for the bookmarked download area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7759,18 +7826,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7781,34 +7848,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Syötä haettavan paikan nimi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr ""
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7819,7 +7886,9 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
@@ -7828,10 +7897,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tyyppi"
@@ -7840,5 +7910,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7850,17 +7920,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "tuntematon"
@@ -8212,5 +8281,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8664,9 +8733,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
 #. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8676,7 +8745,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
 #. item "Water/Water/Stream" text "Name"
 #. item "Water/Water/Canal" text "Name"
@@ -8688,16 +8757,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Taso"
@@ -9124,68 +9193,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9195,23 +9264,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9221,5 +9290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9227,5 +9296,5 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9233,5 +9302,5 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9241,23 +9310,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9266,5 +9335,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9273,10 +9342,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9286,43 +9355,43 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9331,9 +9400,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9341,5 +9410,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9347,23 +9416,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9372,5 +9441,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9384,5 +9453,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9395,11 +9464,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9408,32 +9477,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9482,28 +9551,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-pisteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Virhe tulkittaessa {0}:aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9514,34 +9582,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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [pp/kk/vvvv tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9551,64 +9619,64 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9618,45 +9686,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9665,5 +9733,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9671,22 +9739,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Valittu polku ei sisällä valittua pistettä."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9695,17 +9762,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:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9714,5 +9781,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9721,75 +9788,75 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ei dataa ladattuna."
-msgstr[1] "Ei dataa ladattuna."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} kuvasta löytyi gps-sijaintitiedot."
-msgstr[1] "{0} kuvasta löytyi gps-sijaintitiedot."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9798,5 +9865,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9893,5 +9960,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9899,5 +9966,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9906,29 +9973,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9936,17 +10003,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Näytä/piilota teksti/kuvakkeet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -9954,5 +10021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -9960,5 +10027,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9984,5 +10051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9990,5 +10057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10040,7 +10107,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Tekijä"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10130,7 +10196,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Tekijä"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10189,7 +10254,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Yhteys epäonnistui"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10269,7 +10333,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Valitse ainakin neljä pistettä."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10279,7 +10342,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Sulje ikkuna ja peruuta lataus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10592,5 +10654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Ole hyvä ja valitse muokattava rivi."
@@ -10604,5 +10666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10741,9 +10803,4 @@
 msgstr "Piirtotyyli {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Taso: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10773,6 +10830,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10797,5 +10854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid "Draw a circle form HDOP value."
-msgstr ""
+msgstr "Piirrä ympyrä HDOP-arvosta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
@@ -10811,8 +10868,8 @@
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -10834,13 +10891,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Polkupyörä"
@@ -10873,12 +10930,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -11117,6 +11174,6 @@
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural "The following {0} plugins have been downloaded successfully:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Liitännäinen on ladattu <strong>onnistuneesti</strong>:"
+msgstr[1] "{0} liitännäistä on ladattu <strong>onnistuneesti</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
@@ -11125,10 +11182,10 @@
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Littännäisen lataus <strong>epäonnistui</strong>:"
+msgstr[1] "{0}:n littännäisen lataus <strong>epäonnistui</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
-msgstr ""
+msgstr "Etsi:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
@@ -11164,9 +11221,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Lataa lista"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Lataa lista saatavilla olevista liitännäisistä"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -11178,9 +11235,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Update plugins"
-msgstr ""
+msgstr "Päivitä liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Päivitä valitut liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
@@ -11223,5 +11280,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11237,13 +11293,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei "
-"ehkä löydy näppäimistöltäsi. Käytä vain näppäimiä, jotka löytyvät "
-"näppäimistöltäsi. Esimerkiksi, jos näppäimistölläsi ei ole Copy-näppäintä "
-"(joka löytyy Sun-koneiden näppäimistöiltä muttei pc-näppäimistöiltä), älä "
-"valitse sitä. Listassa on myös merkkejä, jotka saat näppäinyhdistelmien "
-"takaa: älä käytä niitäkään vaan vain kunkin näppäimen perusmerkitystä. "
-"Esimerkki: ';' on englantilaisella näppäimistöllä yksi näppäin mutta "
-"suomalaisella näppäimistöllä vaihto+\",\" . JOSM ei voi erottaa näitä ja "
-"näiden käyttö voi johtaa väärien toimintojen suorittamiseen.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11857,5 +11904,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11863,18 +11917,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11885,16 +11939,16 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11903,18 +11957,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Muuta ominaisuuksia"
@@ -12190,6 +12243,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12214,9 +12267,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12232,7 +12285,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Etsitään rantaviivaa..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12240,7 +12292,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12312,5 +12370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Tuodut koordinaatit: "
@@ -12411,9 +12469,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Lähetetään {0} objektia..."
-msgstr[1] "Lähetetään {0} objektia..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12791,4 +12849,6 @@
 "missing in the loaded data and is therefore incomplete too."
 msgstr ""
+"Polku {0} ({1} pistettä) merkittiin keskeneräiseksi koska ainakin yksi sen "
+"pisteistä puuttui ladatusta datasta ja on siten myös keskeneräinen."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
@@ -12939,9 +12999,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Lähetetään {0} objektia..."
-msgstr[1] "Lähetetään {0} objektia..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13039,5 +13099,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13046,7 +13106,5 @@
 "are:"
 msgstr[0] ""
-"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 msgstr[1] ""
-"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13311,5 +13369,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13317,8 +13374,4 @@
 "file a bug report."
 msgstr ""
-"Tapahtui odottamaton poikkeus.\n"
-"\n"
-"Tämä on aina ohjelmointivirhe. Jos käytät uusinta\n"
-"JOSM:n versiota, ilmoita ohjelmavirheestä."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13410,6 +13463,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
 "<br>Please launch the preferences dialog and retrieve another OAuth token.</"
 "html>"
@@ -13525,6 +13578,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13533,5 +13586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13679,4 +13732,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13767,5 +13821,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -14344,5 +14398,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14499,21 +14553,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14545,9 +14599,9 @@
 msgstr "Luo kopio polusta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14562,13 +14616,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Tuo jälki GPX-tasolta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Poista olemassa oleva jälki"
@@ -14577,6 +14631,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "GPX-tasoa ei löytynyt."
@@ -14802,17 +14856,17 @@
 msgstr "Lataa kuvat uutena tasona."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Etsitään rantaviivaa..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14856,42 +14910,41 @@
 msgstr "Poistetaan pisteiden kaksoiskappaleet..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker-ääriviiva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "itä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "koillinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "pohjoinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "luode"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "länsi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "lounas"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "etelä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "kaakko"
@@ -14947,6 +15000,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14955,69 +15008,69 @@
 msgstr "vesi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "rantaviiva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "maa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Enimmäismäärä segmenttejä/polku"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Harmaan enimmäisarvo, joka tulkitaan vetenä (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat-kuvien koko (pikselit/aste)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat-kuvien koko (pikseleinä)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Siirrä kaikkia jälkiä itään (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Siirrä kaikkia jälkiä pohjoiseen (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Suunta, josta etsitään maata"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Anna poluille tagi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-taso"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Välimuistin maksimikoko (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Välimuistin enimmäisikä (päivää)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -15025,5 +15078,5 @@
 "250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15033,5 +15086,5 @@
 "yksinkertaistusta). Oletusarvo 50000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -15041,5 +15094,5 @@
 "väliltä 0-255, oletus 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15049,26 +15102,26 @@
 "antavat enemmän pisteitä ja tarkempia jälkiä. Oletus on 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Landsat-kuvien tarkkuus, pikselit/aste. Oletus on 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Landsat-kuvan koko pikseleinä. Oletus on 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Mistä suunnasta etsitään maata. Oletus on itä."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15076,33 +15129,33 @@
 "(nothing). Oletus on vesi (water)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Käytettävä WMS-taso. Oletus on IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Jokaisen välimuistihakemiston enimmäiskoko. Oletus on 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Välimuistin enimmäisikä päivissä. Oletus on 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Tietolähteen nimi. Oletus on Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Liitännäinen vesimassojen rajaamiseen Landsat-kuvista."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+msgstr "Liitännäinen vesialueiden rajaamiseen Landsat-kuvista."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakevalker-liitännäisen asetukset"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Ladataan kuvaa..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kuvaa ei voitu ladata"
@@ -15126,5 +15179,5 @@
 msgstr "Yhteys epäonnistui"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15155,5 +15208,5 @@
 msgstr "Kurssi"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-taso"
@@ -15227,5 +15280,5 @@
 msgstr "Kahden pisteen välinen kulma"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Taso, jolla tehdään mittaukset"
@@ -15488,4 +15541,75 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Tekojärvi"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Syötä uuden pisteen koordinaatit."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Virhe"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Syötettyä aikaa ei voitu tulkita oikein."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Korvaa"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15761,6 +15885,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
 #, java-format
 msgid "Error while exporting {0}: {1}"
@@ -15783,5 +15907,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Etsi..."
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -15882,72 +16006,128 @@
 msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Talonumeroiden interpolointilinja"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Tiet"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Karttaruutujen numerot"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Puhelinnumero"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Luo uusi relaatio"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Luo kopio polusta"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Kadunnimi"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16185,5 +16365,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
@@ -16193,5 +16373,5 @@
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16203,9 +16383,9 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16240,5 +16420,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16390,7 +16570,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Virheelliset avain/arvo-parit"
@@ -16398,81 +16578,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Piirto-ongelma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Avain \"{0}\" virheellinen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tyhjät arvot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Epäkelpo avain"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Virheellinen välilyönti avaimessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Arvossa välilyönti alussa tai lopussa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Tarkista ominaisuuksien avaimet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16483,88 +16663,88 @@
 "php/User:JLS/speller )"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Lisää tiedosto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Poista valittu lähde listasta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Tarkista ominaisuuksien arvot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Etsi FIXME:t"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Etsii solmut ja polut joissa arvona FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Käytä oletussääntötiedostoa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17009,5 +17189,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17018,13 +17198,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17033,50 +17217,46 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17329,6 +17509,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17337,15 +17524,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17354,10 +17541,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17366,15 +17553,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17384,10 +17571,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17396,5 +17583,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17403,10 +17590,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17513,6 +17700,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
 #. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
@@ -17520,6 +17716,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Numero"
@@ -17536,5 +17733,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Kaistat"
@@ -17556,10 +17753,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -17603,14 +17800,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -17653,13 +17850,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17697,13 +17894,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -17738,13 +17935,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -17779,13 +17976,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Penger"
@@ -17917,4 +18114,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Muokkaa tien ominaisuuksia"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17932,15 +18138,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17952,5 +18158,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Asuinkatu"
@@ -17959,5 +18165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Muokkaa asuinkadun ominaisuuksia"
@@ -17975,16 +18181,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Pinta"
@@ -18006,166 +18215,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "päällystetty"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "päällystämätön"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "metsä"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "mukulakivi"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "sora"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "ruoho"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "hiekka"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "maa"
@@ -18173,5 +18389,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Pihakatu"
@@ -18180,5 +18396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Muokkaa pihakadun ominaisuuksia"
@@ -18186,5 +18402,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Kävelykatu"
@@ -18193,5 +18409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Muokkaa kävelykadun ominaisuuksia"
@@ -18199,5 +18415,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18206,5 +18422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18214,18 +18430,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18233,5 +18449,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -18241,5 +18457,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
@@ -18247,5 +18463,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -18254,5 +18470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -18261,20 +18477,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -18282,9 +18498,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Pääsy (access)"
 
 #. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #. item "Highways/Streets/Road Restrictions" combo "Bicycle"
 #. item "Highways/Streets/Road Restrictions" combo "Foot"
@@ -18295,6 +18512,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18306,4 +18521,5 @@
 #. item "Ways/Path" combo "Snowmobile"
 #. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -18322,141 +18538,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "kyllä"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "yksityinen"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "määränpää"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "kyllä"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "yksityinen"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "määränpää"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "ei"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -18471,10 +18695,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 build/trans_presets.java:784
+#: build/trans_presets.java:806 build/trans_presets.java:843
+#: build/trans_presets.java:856 build/trans_presets.java:868
+#: build/trans_presets.java:880 build/trans_presets.java:892
+#: build/trans_presets.java:932
 msgid "Horse"
 msgstr "Hevonen"
@@ -18490,10 +18714,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -18508,27 +18732,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:934
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Moottorivene"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Vene"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -18536,25 +18752,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -18565,5 +18781,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -18583,10 +18799,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -18608,10 +18824,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -18633,10 +18849,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -18658,5 +18874,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18671,9 +18887,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "tie"
@@ -18687,9 +18903,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "pihakatu"
@@ -18719,10 +18935,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18752,5 +18968,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18762,10 +18978,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18773,19 +18989,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Liittymä"
@@ -18801,5 +19017,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -18807,5 +19023,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -18814,40 +19030,34 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Metsätie (track)"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "sora"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18855,5 +19065,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18861,27 +19071,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Lähde"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18889,5 +19098,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Polku"
@@ -18896,12 +19105,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Pyörätuoli"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18917,7 +19146,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Muokkaa ratsastustien ominaisuuksia"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18930,7 +19158,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18965,24 +19192,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Yhdistä silti"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Muokkaa jalkakäytävän ominaisuuksia"
+msgstr ""
 
 #. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18990,5 +19214,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Portaat"
@@ -18998,5 +19222,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
@@ -19004,10 +19228,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -19015,15 +19239,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -19031,5 +19255,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -19037,5 +19261,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19068,17 +19293,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operaattori"
@@ -19087,5 +19312,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -19095,5 +19320,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -19102,27 +19327,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19130,6 +19355,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19138,11 +19363,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19150,30 +19375,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -19181,5 +19406,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19188,14 +19413,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19206,14 +19477,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -19223,26 +19494,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr ""
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
 
 #. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -19250,5 +19523,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19256,5 +19529,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19262,11 +19535,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19274,5 +19554,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19280,5 +19560,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19290,7 +19570,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19298,5 +19578,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Esteet"
@@ -19304,5 +19584,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19310,5 +19590,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19353,16 +19633,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19371,5 +19651,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19377,5 +19657,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19383,10 +19663,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19394,15 +19674,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19410,5 +19690,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19416,10 +19696,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19429,5 +19709,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -19436,12 +19716,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Aita"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muuri"
@@ -19449,5 +19741,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -19456,5 +19748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19466,15 +19758,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Portti"
@@ -19482,50 +19775,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19533,25 +19826,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19562,11 +19855,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Lähde"
@@ -19574,5 +19867,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -19580,5 +19873,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19586,10 +19879,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19597,10 +19901,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanava"
@@ -19608,10 +19912,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Joki"
@@ -19621,5 +19925,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -19627,15 +19931,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -19643,15 +19947,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -19659,15 +19963,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19675,5 +19979,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -19682,10 +19986,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -19696,14 +20000,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "räme"
@@ -19717,35 +20021,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Muta"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Ranta"
@@ -19753,20 +20057,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Kallio"
@@ -19774,10 +20078,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -19785,5 +20089,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -19791,5 +20095,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -19797,5 +20101,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19804,5 +20108,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19810,10 +20114,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Telakka"
@@ -19821,5 +20125,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19827,5 +20131,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Pato"
@@ -19833,15 +20137,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -19850,5 +20154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19856,20 +20160,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19878,15 +20182,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Laituri"
@@ -19894,10 +20198,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -19905,10 +20209,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19918,20 +20222,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Rata"
@@ -19939,5 +20243,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19946,139 +20250,378 @@
 #. <space />
 #. <key key="railway" value="rail" />
+#. <optional>
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+msgid "Types"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "sivuraide"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "Electrified"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "contact_line"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Jännite"
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Kapean raideleveyden rata"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Muokkaa kapean raideleveyden rataa"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Säilytetty"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Muokkaa museroradan ominaisuuksia"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Pikaraitiotie"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Muokkaa metron ominaisuuksia"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Raitiotie"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Käytöstä poistettu rata"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "sivuraide"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Kapean raideleveyden rata"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Muokkaa kapean raideleveyden rataa"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Säilytetty"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Muokkaa museroradan ominaisuuksia"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Pikaraitiotie"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Muokkaa metron ominaisuuksia"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Raitiotie"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Käytöstä poistettu rata"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -20087,5 +20630,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -20094,5 +20637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Risteys"
@@ -20102,5 +20645,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20108,5 +20651,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -20115,10 +20658,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1289
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -20126,10 +20676,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -20137,10 +20687,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -20148,10 +20698,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20159,10 +20709,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20170,12 +20720,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -20185,9 +20748,66 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20241,32 +20861,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -20325,94 +20945,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20424,5 +21120,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20432,5 +21128,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -20441,25 +21137,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20468,48 +21164,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -20517,5 +21213,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -20524,10 +21220,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20535,5 +21231,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20541,10 +21237,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
@@ -20553,15 +21249,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20571,5 +21267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20577,5 +21273,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20583,5 +21279,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -20589,5 +21285,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -20595,5 +21291,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -20602,5 +21298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -20608,5 +21304,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -20615,5 +21311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -20625,5 +21321,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20631,10 +21327,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -20643,10 +21339,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -20655,5 +21351,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -20662,5 +21358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -20668,5 +21364,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -20676,5 +21372,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -20683,25 +21379,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Penkki"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20709,5 +21406,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taksi"
@@ -20715,5 +21412,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -20721,32 +21418,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Lentokenttä"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+msgid "Edit Helipad"
+msgstr ""
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Apron"
+msgstr ""
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+msgid "Hangar"
+msgstr ""
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Loisto"
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -20758,5 +21550,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -20765,15 +21557,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motelli"
@@ -20781,20 +21573,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -20802,10 +21594,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostelli"
@@ -20813,30 +21605,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -20844,10 +21636,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -20858,5 +21650,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -20864,5 +21656,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -20870,5 +21662,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20876,61 +21668,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -20938,9 +21742,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kahvila"
@@ -20948,9 +21760,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr ""
@@ -20958,18 +21770,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20977,9 +21789,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -20987,24 +21799,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museo"
@@ -21012,9 +21824,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -21023,9 +21835,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -21033,24 +21845,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Taideteos"
@@ -21058,5 +21870,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -21064,19 +21876,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21114,5 +21926,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21120,28 +21932,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21151,5 +21963,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21157,5 +21969,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21163,6 +21975,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -21170,5 +21982,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21176,6 +21988,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -21183,5 +21995,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21189,46 +22001,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21236,29 +22048,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21266,25 +22078,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Linna"
@@ -21293,19 +22105,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -21314,9 +22126,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -21324,10 +22136,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21335,5 +22147,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21341,15 +22153,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -21357,55 +22169,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -21413,35 +22225,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -21455,6 +22267,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -21846,6 +22658,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21879,225 +22691,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22136,21 +22948,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tyyppi"
@@ -22189,203 +23001,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22393,56 +23205,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Ammunta"
@@ -22450,182 +23258,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Rakennus"
@@ -22633,5 +23441,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -22639,10 +23447,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -22650,10 +23458,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -22661,10 +23469,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -22673,10 +23481,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Vankila"
@@ -22685,10 +23493,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Poliisiasema"
@@ -22698,10 +23506,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -22710,10 +23518,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -22721,5 +23529,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -22727,15 +23535,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Koulu"
@@ -22743,10 +23551,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Yliopisto"
@@ -22754,10 +23562,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Korkeakoulu"
@@ -22765,5 +23573,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -22771,5 +23579,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -22778,10 +23586,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Kirjasto"
@@ -22790,9 +23598,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -22800,10 +23608,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teatteri"
@@ -22812,10 +23620,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr ""
@@ -22825,5 +23633,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr ""
@@ -22832,6 +23640,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Uskonto"
@@ -22840,66 +23648,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22908,81 +23716,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -22991,5 +23799,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -22997,5 +23805,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Talon numero"
@@ -23003,25 +23811,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Maakoodi"
@@ -23030,5 +23838,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -23036,61 +23844,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23098,25 +23906,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -23124,10 +23932,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -23135,10 +23943,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Putki"
@@ -23147,37 +23955,37 @@
 #. <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:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -23187,10 +23995,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Nosturi"
@@ -23198,21 +24006,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Loisto"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23220,10 +24023,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -23231,11 +24034,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23245,35 +24060,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23282,10 +24097,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -23294,5 +24109,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -23300,10 +24115,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -23314,23 +24129,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -23339,79 +24154,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Jännite"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Puhelin"
@@ -23420,5 +24230,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -23426,5 +24236,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Kolikot"
@@ -23432,5 +24242,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23438,5 +24248,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23444,5 +24254,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23450,15 +24260,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -23467,5 +24277,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -23473,63 +24283,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Romumetalli"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
+msgstr ""
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23608,5 +24429,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23616,31 +24437,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -23649,30 +24470,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Lähde"
@@ -23681,10 +24502,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -23693,10 +24514,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant"
+#. <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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23704,15 +24538,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23720,10 +24554,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23732,28 +24566,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -23761,9 +24595,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kioski"
@@ -23771,27 +24605,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -23799,5 +24633,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -23805,88 +24639,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -23894,9 +24728,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Leipomo"
@@ -23904,9 +24738,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23914,18 +24748,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23933,54 +24767,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23988,9 +24822,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23998,9 +24832,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -24008,54 +24842,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -24063,9 +24897,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Pesula"
@@ -24073,9 +24907,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -24083,28 +24917,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Pankki"
@@ -24112,14 +24946,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -24127,5 +24961,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -24133,15 +24967,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -24149,18 +24983,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -24168,5 +25002,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -24174,9 +25008,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Sairaala"
@@ -24184,10 +25018,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24196,5 +25030,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24203,20 +25037,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24224,5 +25058,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -24231,64 +25065,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24296,15 +25130,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Kaupunki"
@@ -24312,10 +25146,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -24323,25 +25157,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -24349,5 +25183,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24355,10 +25189,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Saari"
@@ -24366,10 +25200,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24377,5 +25211,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24383,5 +25217,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -24389,10 +25223,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Huippu"
@@ -24400,10 +25234,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -24411,10 +25245,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -24422,70 +25256,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Puu"
@@ -24494,15 +25328,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Metsä"
@@ -24511,5 +25345,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -24517,17 +25351,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -24536,14 +25370,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24551,25 +25385,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Tunturi"
@@ -24577,10 +25411,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Nummi"
@@ -24588,5 +25422,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -24594,5 +25428,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -24601,45 +25435,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -24647,25 +25481,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24673,10 +25507,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24684,20 +25518,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24705,5 +25539,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24711,15 +25545,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -24727,9 +25561,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -24737,39 +25571,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -24777,15 +25611,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -24793,50 +25627,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -24846,5 +25680,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24853,10 +25687,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24864,5 +25698,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24871,5 +25705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24877,34 +25711,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24913,15 +25747,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24929,5 +25763,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24936,5 +25770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24942,5 +25776,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -25031,5 +25865,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25039,17 +25873,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25109,5 +25943,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25116,9 +25950,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25132,10 +25966,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25143,31 +25977,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25176,106 +26010,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
-msgstr ""
-
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_style.java:72
-msgid "standard"
 msgstr ""
 
@@ -25811,77 +26570,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-msgstr ""
-
-#. color foot
-#. <icon annotate="true" src="transport/steps.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
-#. <icon annotate="true" src="vehicle/crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="rail"/>
-#. color oldrail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="narrow_gauge"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="monorail"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="turntable"/>
-#. <icon annotate="true" src="transport/turntable.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="buffer_stop"/>
-#. <icon annotate="true" src="transport/buffer_stop.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="platform"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. color rail
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26270,7 +26956,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Ruudukko"
+msgstr ""
 
 #. color manmade
@@ -29409,4 +30094,371 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Preparing..."
+#~ msgstr "Valmistellaan..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Lähetetään..."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Virheellinen salasana tai käyttäjänimi."
+
+#~ msgid "Enter Password"
+#~ msgstr "Anna salasana"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "kuva"
+#~ msgstr[1] "kuvat"
+
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Update"
+#~ msgstr "Päivitä"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Välityspalvelimen osoite"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonyymi"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Välityspalvelimen käyttäjänimi"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Välityspalvelimen portti"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Välityspalvelimen salasana"
+
+#~ msgid "File not found"
+#~ msgstr "Tiedostoa ei löytynyt"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Avaa selaimessa"
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Downloading..."
+#~ msgstr "Ladataan..."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Do not show again"
+#~ msgstr "Älä näytä uudelleen"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#~ msgid "Read GPX..."
+#~ msgstr "Lue GPX..."
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#~ msgid "Sync clock"
+#~ msgstr "Tahdista kello"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Käytä välityspalvelinta"
+
+#~ msgid "Set the language."
+#~ msgstr "Aseta kieli."
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Virhe ladattaessa sivua {0}"
+
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Load Selection"
+#~ msgstr "Lataa valinta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Anna haettava merkkijono"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "All images"
+#~ msgstr "Kaikki kuvat"
+
+#~ msgid "help"
+#~ msgstr "ohje"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Vain kaksi pistettä sallittu"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Vain yksi piste valittuna"
+
+#~ msgid "Split way segment"
+#~ msgstr "Katkaise polku"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-elementti muussa kuin polussa."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
+
+#~ msgid "Error during parse."
+#~ msgstr "Virhe jäsennettäessä."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Liitännäistä ei löytynyt: {0}."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
+#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
+#~ "yritä myöhemmin uudestaan."
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
+#~ "virhetilanteeseen."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Käytä esivalintaa ”{0}”"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Muokkaa ominaisuuksia"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Tuonnin aikana oli ristiriitoja."
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
+#~ "versioon."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Palvelimeen ei voida yhdistää."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Päivitä valintalista."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Poista valittu taso."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "aikavyöhyke-ero: "
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagien esivalintojen lähteet"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagien esiasetusten lähde"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Lataa puuttuvat liitännäiset"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Liitännäinen on jo olemassa"
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
+
+#~ msgid "All installed plugins are up to date."
+#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
+#~ "lla on oikeus korvata vanhat tiedostot."
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Seuraavissa litännäisissä oli ongelmia:\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Virhe jäsennettäessä"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM-verkko-ohje"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
+
+#~ msgid "No data imported."
+#~ msgstr "Dataa ei tuotu."
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
+
+#~ msgid "Boat"
+#~ msgstr "Vene"
+
+#~ msgid "Motorboat"
+#~ msgstr "Moottorivene"
+
 #~ msgid "Bridleway"
 #~ msgstr "Ratsastustie"
@@ -29418,15 +30470,36 @@
 #~ msgstr "Jalankulkutie"
 
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parametr ''{0}'' ei saa olla \"null\""
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+#~ msgid "Drawbridge"
+#~ msgstr "Laskusilta"
+
+#~ msgid "Shop"
+#~ msgstr "Kauppa"
+
+#~ msgid "map"
+#~ msgstr "kartta"
+
+#~ msgid "bicyclemap"
+#~ msgstr "pyöräkartta"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektilla on ristiriita:"
+#~ msgstr[1] "{0} objektilla on ristiriitoja:"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
+#~ "kirjoittamista."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-tagi muussa kuin relaatiossa."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Vääränlainen pisteen id"
 
 #~ msgid ""
@@ -29439,418 +30512,4 @@
 #~ "poistamiseen.\n"
 #~ "Oletko varma, että haluat jatkaa?"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Avoin"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Suljettu"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "kuva"
-#~ msgstr[1] "kuvat"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Lähetetään..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Virheellinen salasana tai käyttäjänimi."
-
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Update"
-#~ msgstr "Päivitä"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Välityspalvelimen osoite"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyymi"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Välityspalvelimen käyttäjänimi"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Välityspalvelimen portti"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Välityspalvelimen salasana"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Downloading..."
-#~ msgstr "Ladataan..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lue GPX..."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Tahdista kello"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Käytä välityspalvelinta"
-
-#~ msgid "Set the language."
-#~ msgstr "Aseta kieli."
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Load Selection"
-#~ msgstr "Lataa valinta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Anna haettava merkkijono"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "All images"
-#~ msgstr "Kaikki kuvat"
-
-#~ msgid "help"
-#~ msgstr "ohje"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Error during parse."
-#~ msgstr "Virhe jäsennettäessä."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Liitännäistä ei löytynyt: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
-#~ "yritä myöhemmin uudestaan."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
-#~ "virhetilanteeseen."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Käytä esivalintaa ”{0}”"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Muokkaa ominaisuuksia"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Tuonnin aikana oli ristiriitoja."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-#~ "versioon."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Palvelimeen ei voida yhdistää."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Päivitä valintalista."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Poista valittu taso."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "aikavyöhyke-ero: "
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagien esivalintojen lähteet"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagien esiasetusten lähde"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lataa puuttuvat liitännäiset"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Liitännäinen on jo olemassa"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
-#~ "lla on oikeus korvata vanhat tiedostot."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Seuraavissa litännäisissä oli ongelmia:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-verkko-ohje"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "No data imported."
-#~ msgstr "Dataa ei tuotu."
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid "Drawbridge"
-#~ msgstr "Laskusilta"
-
-#~ msgid "Station"
-#~ msgstr "Asema"
-
-#~ msgid "Shop"
-#~ msgstr "Kauppa"
-
-#~ msgid "map"
-#~ msgstr "kartta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "pyöräkartta"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektilla on ristiriita:"
-#~ msgstr[1] "{0} objektilla on ristiriitoja:"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
-#~ "kirjoittamista."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -30005,7 +30664,4 @@
 #~ "lähetetyillä elementeillä on historia."
 
-#~ msgid "Public"
-#~ msgstr "Julkinen"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -30069,4 +30725,7 @@
 #~ msgstr "GPX-jälki ladattu"
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Ei voitu lukea \"{0}\":aa"
@@ -30078,7 +30737,19 @@
 #~ msgstr "Päivittää valitut objektit palvelimelta"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
+
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Liitännäinen {0} ei ole saatavilla."
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+
 #~ msgid "Updating primitive"
 #~ msgstr "Päivitä objekti"
@@ -30086,2 +30757,10 @@
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Suljettu"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Avoin"