Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 26530)
+++ applications/editors/josm/i18n/po/et.po	(revision 26587)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"POT-Creation-Date: 2011-08-28 16:10+0200\n"
 "PO-Revision-Date: 2011-07-20 11:22+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
-"X-Generator: Launchpad (build 13662)\n"
+"X-Launchpad-Export-Date: 2011-08-28 12:02+0000\n"
+"X-Generator: Launchpad (build 13794)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -47,10 +47,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:221
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:131
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
@@ -68,7 +68,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:315
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:234
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
@@ -77,8 +77,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:334
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
@@ -98,4 +98,6 @@
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:495
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:501
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -149,6 +151,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -164,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:898
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -182,6 +184,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1270
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1280
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1199
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1209
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
@@ -248,6 +250,6 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:72
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:106
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:238
@@ -289,6 +291,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:542
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -360,5 +362,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:158
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
@@ -369,9 +371,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:217
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
@@ -382,8 +384,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -399,4 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -408,6 +411,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
@@ -430,4 +433,5 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:389
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
@@ -466,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:640
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:673
 msgid "Merge"
 msgstr "Liida"
@@ -487,13 +491,14 @@
 msgstr "Lisa  aluskaart {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 msgid "Add Node..."
 msgstr "Lisa sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
-msgid "Add a node by entering latitude and longitude."
-msgstr "Lisa sõlm laiuskraadi ja pikkuskraadi järgi."
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
+msgid "Add a node by entering latitude / longitude or easting / northing."
+msgstr ""
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -506,5 +511,5 @@
 #. * for now this is a reasonable approximation.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
@@ -572,4 +577,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:57
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
@@ -624,5 +630,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:175
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
@@ -661,5 +667,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:79
 msgid "data"
 msgstr "andmed"
@@ -674,5 +680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:59
 msgid "conflict"
 msgstr "vastuolu"
@@ -728,5 +734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:378
 msgid "Close open changesets"
 msgstr "Sule avatud muudatused"
@@ -739,5 +745,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
@@ -851,5 +857,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:103
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:117
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:32
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:89
@@ -862,5 +868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:60
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:89
 msgid "No data loaded."
 msgstr "Andmeid ei laetud."
@@ -875,10 +881,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -888,7 +894,7 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:927
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:516
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:815
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:938
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:428
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132
@@ -912,6 +918,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:216
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:217
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:225
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
@@ -920,5 +926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105
 msgid "File exists. Overwrite?"
@@ -945,37 +951,37 @@
 msgstr "Laadi kaardi andmed OSMi serverist"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:60
 msgid "Download object..."
 msgstr "Laadi objekt alla..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
 msgid "Download OSM object by ID."
 msgstr "Laadi alla OSM objekt ID alusel."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:95
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:82
 msgid "Object type:"
 msgstr "Objekti tüüp:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:97
 msgctxt "osm object types"
 msgid "mixed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:98
 msgid "Choose the OSM object type"
 msgstr "Vali OSMi objekti tüüp"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:90
 msgid "Object ID:"
 msgstr "Objekti ID:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:108
 msgid "Enter the ID of the object that should be downloaded"
 msgstr "Sisesta allalaaditava objekti ID"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:73
@@ -983,19 +989,19 @@
 msgstr "Eralda kiht."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:113
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:71
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:31
 msgid "Download referrers"
 msgstr "Laadi alla viitajad"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
 msgid "Select if the referrers of the object should be downloaded as well"
 msgstr "Vali, kui on vaja alla laadida ka objekti viitajad."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:118
 msgid ""
 "Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
@@ -1004,20 +1010,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:152
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/DownloadPrimitiveTask.java:45
 msgid "Download object"
 msgstr "Laadi objekt alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:157
 msgid "Start downloading"
 msgstr "Alusta allalaadimist"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:158
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:96
 msgid "Close dialog and cancel downloading"
 msgstr "Sule dialoogiaken ja katkesta allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:173
 msgid ""
 "Invalid ID list specified\n"
@@ -1025,5 +1031,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:205
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
@@ -1031,5 +1037,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:206
 #, java-format
 msgid "One object could not be downloaded.<br>"
@@ -1038,5 +1044,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:176
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:210
 msgid ""
 "The server replied with response code 404.<br>This usually means, the server "
@@ -1044,9 +1050,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:212
 msgid "missing objects:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:237
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
 msgid "Object deleted"
@@ -1055,5 +1061,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:239
 #, java-format
 msgid "One downloaded object is deleted."
@@ -1064,5 +1070,6 @@
 #. content.add(scroller);
 #. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
@@ -1084,7 +1091,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:707
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:740
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1444
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:524
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:530
 msgid "Duplicate"
 msgstr "Kahekordista"
@@ -1202,5 +1209,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
@@ -1432,5 +1438,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
@@ -1527,13 +1534,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:209
 msgid "Abort Merging"
 msgstr "Katkesta liitmine"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:211
 msgid "Click to abort merging nodes"
 msgstr "Vajuta, katkestamaks sõlmede liitmist"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:218
 #, java-format
 msgid ""
@@ -1542,5 +1549,5 @@
 "Sõlmi ei saa liita - selleks peaks kustutama kasutusel oleva tee ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:319
 #, java-format
 msgid "Merge {0} nodes"
@@ -1571,11 +1578,77 @@
 msgstr "Palun vali vähemalt üks sõlm või joon."
 
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:52
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
 msgid "up"
 msgstr "Üles"
 
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:54
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
 msgid "down"
 msgstr "Alla"
@@ -1612,5 +1685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
 msgid "Cannot move objects outside of the world."
 msgstr "Objekte ei saa maailmast välja viia"
@@ -1671,9 +1744,9 @@
 msgstr "Ava fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
 msgid "Opening 1 file..."
 msgstr "Avan 1 faili..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1682,5 +1755,5 @@
 msgstr[1] "Avan {0} faili..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1919,5 +1992,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
 msgid "Redo"
 msgstr "Uuesti"
@@ -1970,5 +2043,5 @@
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:237
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408
@@ -1986,30 +2059,30 @@
 msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 msgid "No Exporter found! Nothing saved."
 msgstr "Eksportijat ei leitud. Mitte midagi ei salvestatud."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Empty document"
 msgstr "Tühi dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save anyway"
 msgstr "Salvesta ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:106
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "The document contains no data."
 msgstr "Dokumendis ei ole andmeid."
 
 #. I18N: Display title of the window showing conflicts
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Conflicts"
 msgstr "Vastuolud"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
 msgid "Reject Conflicts and Save"
 msgstr "Lahenda vastuolud ja salvesta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -2019,13 +2092,13 @@
 "tagasi. Jätkame?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
 msgid "Save OSM file"
 msgstr "Salvesta OSM fail."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
 msgid "Save GPX file"
 msgstr "Salvesta GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:135
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save Layer"
 msgstr "Salvesta kiht"
@@ -2077,6 +2150,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
@@ -2136,5 +2209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -2231,4 +2304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:446
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:494
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -2237,4 +2311,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:500
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -2344,5 +2419,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2391,5 +2466,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1288
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
@@ -2518,5 +2593,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:99
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:96
 msgid "Wireframe View"
 msgstr "Joonvõrgu vaade"
@@ -2673,5 +2748,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:121
 msgid "Ignore"
 msgstr "Eira"
@@ -2758,17 +2833,17 @@
 msgstr "Viga allalaadimisel"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
 msgstr "Kustutusrežiim"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
 msgstr "Kustuta sõlmi või jooni"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:83
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -2783,5 +2858,5 @@
 msgstr "Režiim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:289
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
@@ -2789,53 +2864,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:83
 msgid "Draw"
 msgstr "Joonistamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
 msgid "Draw nodes"
 msgstr "Joonista sõlmi"
 
 #. Add extra shortcut N
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:309
 msgid "Cannot add a node outside of the world."
 msgstr "Sõlme ei saa lisada maailmast väljapoole."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:484
 msgid "Add node"
 msgstr "Lisa sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:486
 msgid "Add node into way"
 msgstr "Lisa teele sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:494
 msgid "Connect existing way to node"
 msgstr "Ühenda olemasolev tee sõlmega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:496
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:370
 msgid "Add a new node to an existing way"
 msgstr "Ühenda uus sõlm olemasoleva teega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:503
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:498
 msgid "Add node into way and connect"
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:905
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:893
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:917
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:895
 #, java-format
 msgid "Insert new node into way."
@@ -2844,14 +2919,14 @@
 msgstr[1] "Lisa {0} joonele uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:905
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
 msgid "Continue way from last node."
 msgstr "Jätka teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:919
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -2883,19 +2958,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:354
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
 msgid "Parallel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:123
 msgid "Make parallel copies of ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:182
 msgid ""
 "Select ways as in Select mode. Drag selected ways or a single way to create "
@@ -2903,9 +2978,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:184
 msgid "Hold Ctrl to toggle snapping"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:534
 msgid ""
 "ParallelWayAction\n"
@@ -2913,13 +2988,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:536
 msgid "Make parallel way error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:28
 msgid "Drag play head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:83
 msgid ""
 "Drag play head and release near track to play audio from there; SHIFT"
@@ -2927,12 +3002,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:297
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:109
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
@@ -2943,9 +3018,9 @@
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
 msgid "Select, move, scale and rotate objects"
 msgstr "Vali, liiguta, skaleeri ja pööra objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2954,17 +3029,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:523
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
 msgid "Move elements"
 msgstr "Liiguta elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
 msgid "Move them"
 msgstr "Liiguta elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
 msgid "Undo move"
 msgstr "Võta liigutamine tagasi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
 #, java-format
 msgid ""
@@ -2977,22 +3052,22 @@
 "Kas liigutame neid elemente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:669
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:671
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:673
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:675
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
 msgid "Release the mouse button to stop scaling."
 msgstr "Skaleerimise lõpetamiseks vabasta hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:677
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3015,37 +3090,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<not>"
 msgstr "<mitte>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<or>"
 msgstr "<või>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<left parent>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<right parent>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<colon>"
 msgstr "<koolon>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<equals>"
 msgstr "<võrdub>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
 msgid "<key>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
 msgid "<question mark>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:53
 msgid "<end-of-file>"
 msgstr ""
@@ -3062,65 +3137,65 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "Filter string:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "Search string:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:174
 msgid "replace selection"
 msgstr "asenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "add to selection"
 msgstr "lisa valikusse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "remove from selection"
 msgstr "eemalda valikust"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "case sensitive"
 msgstr "tõstutundlik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "all objects"
 msgstr "kõik objektid"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "Also include incomplete and deleted objects in search."
 msgstr "Lisaks kaasa otsingusse ka poolikud ja eemaldatud objektid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "regular expression"
 msgstr "regulaaravaldis"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Pagari tänav</b> - ''Pagari'' ja ''tänav'' igas võtmes või nimes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - \"Bak\" ükskõik kus nimes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - võti \"type\" täpse väärtusega \"route\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -3130,117 +3205,158 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - nimes ei esine \"Bak\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 või on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot ükskõik millise väärtusega."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<u>Special targets:</u>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
-msgid "<b>user:</b>... - all objects changed by user"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+msgid "Special targets"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+msgid ""
+"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+"<b>relation</b>)"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#, fuzzy
+msgid "<b>user:</b>... - objects changed by user"
 msgstr "<b>user:</b>... - kõik selle kasutaja muudetud objektid"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#, fuzzy
+msgid "<b>user:anonymous</b> - objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - kõik anonüümse kasutaja muudetud objektid"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#, fuzzy
+msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt selle IDga (uute objektide jaoks 0)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
-msgid ""
-"<b>version:</b>... - object with given version (0 objects without an "
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#, fuzzy
+msgid ""
+"<b>version:</b>... - objects with given version (0 objects without an "
 "assigned version)"
 msgstr ""
 "<b>version:</b>... - selle versiooniga objekt (täpsustamata versioonita 0)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
-msgid ""
-"<b>changeset:</b>... - object with given changeset id (0 objects without "
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#, fuzzy
+msgid ""
+"<b>changeset:</b>... - objects with given changeset id (0 objects without "
 "assigned changeset)"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid ""
-"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
-"max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>role:</b>... - object with given role in a relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid ""
-"<b>timestamp:</b>... -  objects with this timestamp "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
-"(areasize:MIN-MAX or areasize:MAX)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+"<b>version:</b>... - selle versiooniga objekt (täpsustamata versioonita 0)"
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+msgid ""
+"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
+"min-max, nodes:min- or nodes:-max)"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
+msgid ""
+"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
+"max, nodes:min- or nodes:-max)"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#, fuzzy
+msgid "<b>role:</b>... - objects with given role in a relation"
+msgstr "<b>id:</b>... - objekt selle IDga (uute objektide jaoks 0)"
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
+msgid ""
+"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
+"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+msgid ""
+"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
+"areasize:max)"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:224
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:226
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:227
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - kõik sildistamata objektid"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:228
 msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:229
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:230
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+msgid ""
+"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
+"members) in downloaded area"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+msgid ""
+"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
+"current view"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -3248,12 +3364,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:65
 #: build/specialmessages.java:60
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:81
@@ -3263,18 +3379,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254
 msgid "Search"
 msgstr "Otsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:251
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:251
 msgid "Start Search"
 msgstr "Alusta otsingut"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:263
 #, java-format
 msgid ""
@@ -3284,29 +3400,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 msgid "Invalid search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:444
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:446
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:430
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:456
 #, java-format
 msgid "Found {0} matches"
@@ -3314,5 +3430,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:463
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:489
 msgctxt "search"
 msgid "CS"
@@ -3320,5 +3436,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:490
 msgctxt "search"
 msgid "CI"
@@ -3326,5 +3442,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:492
 msgctxt "search"
 msgid "RX"
@@ -3332,10 +3448,10 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:494
 msgctxt "search"
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:53
 #, java-format
 msgid ""
@@ -3345,5 +3461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:54
 #, java-format
 msgid ""
@@ -3353,46 +3469,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:290
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:450
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:476
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:665
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:796
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:680
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:811
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:822
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:847
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:723
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:854
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:725
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:728
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:856
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:859
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:862
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:734
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:865
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:736
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:867
 msgid "Version expected"
 msgstr ""
@@ -3459,6 +3575,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:120
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:550
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:556
 msgid "Errors"
 msgstr ""
@@ -3484,5 +3600,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1576 build/trans_presets.java:3463
+#: build/trans_presets.java:1710 build/trans_presets.java:3619
 msgid "Other"
 msgstr "Muu"
@@ -4118,5 +4234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
 #, java-format
 msgid ""
@@ -4124,5 +4240,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:737
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
 #, java-format
 msgid ""
@@ -4254,16 +4370,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:355
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:383
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:356
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:384
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:135
 #, java-format
 msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:52
 #, java-format
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
@@ -4356,5 +4472,5 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -4365,5 +4481,4 @@
 msgstr ""
 
-#. lighteal
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:30
 msgid "untagged"
@@ -4489,4 +4604,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:71
+msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
@@ -4771,5 +4890,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4259
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -4783,41 +4902,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:146
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:265
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:269
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5083,12 +5202,12 @@
 #. JButton
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:790
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:913
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:801
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:924
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:414
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
@@ -5106,6 +5225,6 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5224,59 +5343,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:35
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:39
 msgid "Turnrestriction"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:35
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:39
 msgid "This test checks if turnrestrictions are valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:84
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:96
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:89
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:105
 msgid "Unknown role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:100
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:109
 msgid "Unknown member type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:105
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:114
 msgid "More than one \"from\" way found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:108
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:117
 msgid "More than one \"to\" way found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:111
-msgid "More than one \"via\" way found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:115
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
+#, fuzzy
+msgid "More than one \"via\" node found"
+msgstr "ühesuunaline silt sõlmel (oneway)"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
+msgid "Cannot mix node and way for role \"via\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:127
 msgid "No \"from\" way found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:119
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:131
 msgid "No \"to\" way found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:135
 msgid "No \"via\" node or way found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:132
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:145
 msgid "The \"from\" way does not start or end at a \"via\" node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:147
 msgid "The \"to\" way does not start or end at a \"via\" node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:167
-msgid "The \"from\" way does not start or end at a \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:172
-msgid "The \"to\" way does not start or end at a \"via\" way."
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:151
+msgid "The \"from\" and the first \"via\" way are not connected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:157
+msgid "The \"via\" ways are not connected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:161
+msgid "The last \"via\" and the \"to\" way are not connected."
 msgstr ""
 
@@ -5492,21 +5620,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:31
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:29
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:32
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:30
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:60
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:43
 msgid "Reversed coastline: land not on left side"
 msgstr "Rannik vastupidises suunas: maa ei asu vasakul"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:63
-msgid "Reversed water: land not on left side"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:66
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:47
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -5589,7 +5713,8 @@
 
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "railway"
 msgstr "Raudtee"
@@ -5611,5 +5736,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:769
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422
@@ -5671,7 +5796,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
 msgid "Conflict"
 msgstr "Vastuolud"
@@ -5708,9 +5833,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
 msgid "Message of the day not available"
 msgstr "Päeva sõnum pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:104
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:107
 msgid "Downloading \"Message of the day\""
 msgstr "Laadin alla \"päeva sõnumit\""
@@ -5982,5 +6107,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
 msgid "Tools"
@@ -6192,9 +6318,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:730
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:853
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:741
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:864
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:393
@@ -6374,5 +6500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:434
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
 msgid "Tags"
@@ -6590,5 +6716,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:695
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:153
 #: build/specialmessages.java:85
 msgid "Up"
@@ -6600,5 +6726,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:163
 msgid "Down"
 msgstr ""
@@ -6714,5 +6840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:106
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:78
 msgid "Coordinates:"
 msgstr ""
@@ -6805,5 +6931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6813,7 +6939,7 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:106
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:570
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:637
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:691
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:576
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:643
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:702
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6826,5 +6952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -6833,7 +6959,7 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:109
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:571
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:638
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:692
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:577
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:644
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:703
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6879,8 +7005,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:132
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:175
 msgid "Conflicts when combining primitives"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:136
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:179
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
@@ -6888,4 +7016,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:141
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:184
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
@@ -6893,4 +7022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:283
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:326
 msgid "No conflicts to resolve"
 msgstr ""
@@ -6898,4 +7028,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:268
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:388
 msgid "Cancel conflict resolution"
 msgstr ""
@@ -6903,4 +7034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:283
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:403
 msgid "Apply resolved conflicts"
 msgstr ""
@@ -6911,4 +7043,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:404
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:867
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:644
@@ -6926,5 +7060,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7007,5 +7141,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427
@@ -7017,5 +7151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:458
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:773
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
 #, java-format
@@ -7051,16 +7185,20 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:802
 msgid "Role:"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:804
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:821
 msgid "Tag modified relations with "
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:824
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -7069,4 +7207,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:827
 msgctxt "tag"
 msgid "Key:"
@@ -7074,4 +7213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:829
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
@@ -7080,4 +7220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: build/specialmessages.java:98
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:830
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:150
 msgid "Value:"
@@ -7085,4 +7226,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:832
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -7090,4 +7232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:844
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -7100,4 +7243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:855
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -7110,4 +7254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:869
 msgid "Apply this role to all members"
 msgstr ""
@@ -7122,20 +7267,23 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1272
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1277
 msgid "Show tags with conflicts only"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1278
 msgid "Show tags with multiple values only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
 msgid "For selected objects only"
 msgstr "Ainult valitud objektid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7144,18 +7292,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr "Muutustekogumid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249
 msgid "Open the list of changesets in the current layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -7163,23 +7311,23 @@
 msgstr "Laadi alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
 msgid "Closes the selected open changesets"
 msgstr "Suleb valitud avatud muutustekogumid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:414
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 msgid "Show info"
 msgstr "Näita infot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411
 msgid "Open a web page for each selected changeset"
 msgstr ""
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450
 #: build/specialmessages.java:49
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
@@ -7187,29 +7335,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:451
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:229
 msgid "Command Stack"
 msgstr "Käsujada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Ava kõikide käskude nimekiri (tagasivõtmise puhver)."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7225,37 +7373,37 @@
 msgstr "Lülita ümber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
+msgid "Undo the selected and all later commands"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
-msgid "Undo the selected and all later commands"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380
 msgid "Redo the selected and all earlier commands"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:110
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:164
 #, java-format
 msgid "Conflicts: {0} unresolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336
 msgid "Resolve"
 msgstr "Lahenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:110
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
 msgid ""
@@ -7308,45 +7456,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:64
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:83
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:84
+msgid "Hide elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+msgid "Inverse filter"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+msgid "Filter mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:144
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:153
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:163
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
-msgid "Enable filter"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
-msgid "Hide elements"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
-msgid "Inverse filter"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
-msgid "Filter mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:201
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -7431,19 +7579,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 #: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
 msgid "History"
 msgstr "Ajalugu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
 msgid "Display the history of all selected items."
 msgstr "Näita kõigi valitud objektide ajalugu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7453,13 +7601,13 @@
 msgstr "Lae uuesti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:334
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:763
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:886
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:774
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:897
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:373
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:510
@@ -7468,44 +7616,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
 msgid "Display the history of the selected objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 msgid "Advanced object info"
 msgstr "Objekti põhjalikum info"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
 msgid "map style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
+#, fuzzy
+msgid "In conflict with:\n"
+msgstr "vastuolu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
 #, java-format
 msgid "Node id={0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191
 msgid " not in data set"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
+msgid " incomplete\n"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
-msgid " incomplete\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:117
 #, java-format
 msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167
 #, java-format
 msgid "Way id={0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
 #, java-format
 msgid " {0} node; "
@@ -7514,14 +7667,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
 msgid "  nodes:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
 #, java-format
 msgid "Relation id={0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
 #, java-format
 msgid " {0} member; "
@@ -7530,15 +7683,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204
 msgid "  members:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:254
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313
 msgid "<new object>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:212
 #, java-format
 msgid ""
@@ -7546,55 +7699,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
 msgid "; deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
 msgid "; deleted-on-server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
 msgid "; modified"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
 msgid "; filtered/hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
 msgid "; filtered/disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236
 msgid "; has direction keys"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238
 msgid " (reversed)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246
 msgid "  tags:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258
 msgid "  way referrer:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269
 msgid "  relation referrer:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:295
 #, java-format
 msgid "id: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297
 #, java-format
 msgid " name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
 #, java-format
 msgid " {0} name: {1}"
@@ -7603,10 +7756,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
 #, java-format
 msgid "Styles Cache for \"{0}\":"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
 #, java-format
 msgid ""
@@ -7616,5 +7769,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329
 #, java-format
 msgid ""
@@ -7623,5 +7776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334
 #, java-format
 msgid ""
@@ -7631,5 +7784,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
 msgid ""
 "\n"
@@ -7638,22 +7791,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:350
 msgid "The 2 selected objects have identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:353
 msgid "The 2 selected objects have different style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:356
 msgid ""
 "Warning: The 2 selected objects have equal, but not identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:363
 msgid "xml"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365
 msgid "mapcss"
 msgstr ""
@@ -7671,5 +7824,5 @@
 #. item "Facilities/Hunting Stand" combo "Hide" display value
 #. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:366
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -7681,10 +7834,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: build/trans_presets.java:581 build/trans_presets.java:628
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:2362 build/trans_presets.java:2709
+#: build/trans_presets.java:2710 build/trans_presets.java:2711
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -7693,5 +7846,5 @@
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:85
 msgid ""
 "Enter the coordinates for the new node.<br/>You can separate longitude and "
@@ -7715,85 +7868,104 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:130
+msgid "Projected coordinates:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:138
+msgid ""
+"Enter easting and northing (x and y) separated by space, comma or semicolon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:154
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:155
+msgid "East/North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:262
 msgid "Please enter a GPS coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:267
-msgid "Close the dialog and create a new node"
-msgstr "Sulge dialoog ja loo uus sõlm"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:280
-msgid "Close the dialog, do not create a new node"
-msgstr "Sule dialoog, ära loo uut sõlme"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
+msgid "Please enter a Easting and Northing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:144
+#, java-format
+msgid "Toggle visibility of layer: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Layers"
 msgstr "Kihid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Open a list of all loaded layers."
 msgstr "Ava kõikide laetud kihtide nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:353
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:401
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1461
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:447
 msgid "Toggle visible state of the selected layer."
 msgstr "Muuda valitud kihi nähtavust."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:507
 msgid "Opacity"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:486
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:519
 msgid "Adjust opacity of the layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:610
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:679
 msgid "Merge this layer into another layer"
 msgstr "Liida see kiht teisega"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:713
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:746
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:822
 msgid "layer is currently visible (click to hide layer)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:822
 msgid "layer is currently hidden (click to show layer)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:836
 msgid "this layer is the active layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:836
 msgid "this layer is not currently active (click to activate)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952
 msgid "Move the selected layer one row up."
 msgstr "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
@@ -7816,89 +7988,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:297
 msgid "Turn selected styles on or off"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:332
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:332
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:376
 msgid "Reload from file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:377
 msgid "reload selected styles from file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:436
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:425
 msgid "Save as..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:437
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:426
 msgid "Save a copy of this Style to file and add it to the list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:231
 msgid "Reloading style sources"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:480
 #, java-format
 msgid "Save style ''{0}'' as ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:524
+msgid "view meta information, error log and source definition"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
-msgid "view meta information, error log and source definition"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
 msgid "Map Style info"
 msgstr ""
 
-#. <key key="power" value="generator" />
 #. item "Power/Power Generator" combo "Source"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:573
-#: build/trans_presets.java:3104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
+#: build/trans_presets.java:3250
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:586
 msgid "Title:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:588
 msgid "URL:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:590
 msgid "Built-in Style, internal path:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:592
 msgid "Path:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:595
 msgid "Icon:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:598
 msgid "Background:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 msgid "Style is currently active?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -7908,24 +8079,24 @@
 
 #. group "Relations"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:778
-#: build/trans_presets.java:4095
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
+#: build/trans_presets.java:4258
 msgid "Relations"
 msgstr "Relatsioonid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 msgid "Open a list of all relations."
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272
 msgid "Open an editor for the selected relation"
 msgstr "Ava valitud relatsioon redaktoris."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:351
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
@@ -7934,5 +8105,5 @@
 msgstr "Loo uus relatsioon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
@@ -7940,109 +8111,109 @@
 msgstr "Tee sellest relatsioonist koopia ja ava see redaktoriaknas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
 msgid "Add the selected relations to the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
 msgid "Select relation (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
 msgid "Select members (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:509
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:818
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1272
+msgid "Download incomplete members of selected relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
-msgid "Download incomplete members of selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:776
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relatsioone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 msgid "Current Selection"
 msgstr "Praegune valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 msgid "Open a selection list window."
 msgstr "Ava valiku nimekirja aken."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:255
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:310
 msgid "Zoom to selection"
 msgstr "Suurenda valikule"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:389
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 msgid "Zoom to selected element(s)"
 msgstr "Suurenda valitud elementidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:421
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:376
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1226
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:404
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1227
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:500
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:454
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -8052,27 +8223,27 @@
 msgstr "Valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:465
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valik: Relatsioonid:{0} / Teed:{1} / Punktid:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:783
 #, java-format
 msgid "Selection: {0}"
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
 msgid "Inspect"
 msgstr "Vaata andmeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:430
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -8080,20 +8251,20 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/KeySignaturesDialog.java:134
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:154
 msgid "Authors"
 msgstr "Autorid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:70
 msgid "Open a list of people working on the selected objects."
 msgstr "Ava valitud objektiga töötavate inimeste nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:152
 #, java-format
 msgid "{0} Author"
@@ -8102,13 +8273,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Select objects submitted by this user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:204
 msgid "Launches a browser with information about the user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 #, java-format
 msgid ""
@@ -8116,5 +8287,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:239
 #, java-format
 msgid ""
@@ -8123,13 +8294,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:241
 msgid "Missing encoding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
 msgid "Load CT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:265
 msgid ""
 "Loads information about relicensing status from the server. Users having "
@@ -8137,73 +8308,73 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "Author"
 msgstr "Autor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "# Objects"
 msgstr "# Objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "CT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
 msgid "Open the validation window."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:83
 msgid "Zoom to problem"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:116
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43
 msgid "Fix"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:116
 msgid "Fix the selected issue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:122
 msgid "Ignore the selected issue next time."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
+msgid "Whole group"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
+msgid "Single elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
+msgid "Nothing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:227
+msgid "Ignore whole group or individual elements?"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
-msgid "Whole group"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
-msgid "Single elements"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
-msgid "Nothing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:229
-msgid "Ignore whole group or individual elements?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:230
 msgid "Ignoring elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:522
 msgid "Fixing errors ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:552
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:545
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:560
 msgid "Updating map ..."
 msgstr ""
@@ -8648,10 +8819,22 @@
 #. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Gondola" text "Name"
+#. <key key="aerialway" value="mixed_lift" />
+#. item "Aerialway/Mixed Lift" text "Name"
+#. <key key="aerialway" value="t-bar" />
+#. item "Aerialway/T-bar Lift" text "Name"
+#. <key key="aerialway" value="j-bar" />
+#. item "Aerialway/J-bar Lift" text "Name"
+#. <key key="aerialway" value="platter" />
+#. item "Aerialway/Platter Lift" text "Name"
+#. <key key="aerialway" value="rope_tow" />
+#. item "Aerialway/Rope Tow" text "Name"
+#. <key key="aerialway" value="magic_carpet" />
+#. item "Aerialway/Magic Carpet" text "Name"
+#. <key key="aerialway" value="goods" />
+#. item "Aerialway/Goods" text "Name"
 #. <key key="aerialway" value="station" />
 #. item "Aerialway/Station" text "Name"
 #. <key key="aerialway" value="pylon" />
 #. item "Aerialway/Pylon" text "Name"
-#. <key key="aerialway" value="goods" />
-#. item "Aerialway/Goods" text "Name"
 #. <key key="amenity" value="parking" />
 #. item "Car/Parking" text "Name"
@@ -8843,14 +9026,16 @@
 #. <key key="amenity" value="driving_school" />
 #. item "Education/Driving School" text "Name"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="doctors" />
 #. item "Health/Doctors" text "Name"
 #. <key key="amenity" value="dentist" />
 #. item "Health/Dentist" text "Name"
+#. <key key="amenity" value="nursing_home" />
+#. item "Health/Nursing Home" text "Name"
 #. item "Health/Pharmacy" text "Name"
 #. <space />
 #. <key key="shop" value="hearing_aids" />
 #. item "Health/Hearing Aids" text "Name"
-#. <key key="amenity" value="hospital" />
-#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="veterinary" />
 #. item "Health/Veterinary" text "Name"
@@ -9005,4 +9190,5 @@
 #. <key key="man_made" value="surveillance" />
 #. item "Man Made/Man Made/Surveillance" text "Name"
+#. <key key="power" value="generator" />
 #. item "Power/Power Generator" text "Name"
 #. <key key="power" value="station" />
@@ -9199,4 +9385,7 @@
 #. item "Places/Hamlet" text "Name"
 #. <space />
+#. <key key="place" value="isolated_dwelling" />
+#. item "Places/Isolated Dwelling" text "Name"
+#. <space />
 #. <key key="place" value="locality" />
 #. item "Places/Locality" text "Name"
@@ -9314,4 +9503,5 @@
 #. item "Relations/Turn restriction" text "Name"
 #. item "Relations/Route" text "Name"
+#. item "Relations/Directional Route (North America)" text "Name"
 #. <key key="type" value="network" />
 #. item "Relations/Route network" text "Name"
@@ -9319,182 +9509,188 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 #: build/specialmessages.java:70 build/trans_presets.java:116
 #: build/trans_presets.java:154 build/trans_presets.java:196
-#: build/trans_presets.java:236 build/trans_presets.java:257
-#: build/trans_presets.java:277 build/trans_presets.java:297
-#: build/trans_presets.java:318 build/trans_presets.java:337
-#: build/trans_presets.java:358 build/trans_presets.java:393
-#: build/trans_presets.java:413 build/trans_presets.java:471
-#: build/trans_presets.java:491 build/trans_presets.java:506
-#: build/trans_presets.java:521 build/trans_presets.java:546
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:627 build/trans_presets.java:650
-#: build/trans_presets.java:670 build/trans_presets.java:690
-#: build/trans_presets.java:710 build/trans_presets.java:720
-#: build/trans_presets.java:731 build/trans_presets.java:793
-#: build/trans_presets.java:817 build/trans_presets.java:826
-#: build/trans_presets.java:887 build/trans_presets.java:1040
-#: build/trans_presets.java:1048 build/trans_presets.java:1056
-#: build/trans_presets.java:1064 build/trans_presets.java:1075
-#: build/trans_presets.java:1084 build/trans_presets.java:1090
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1119 build/trans_presets.java:1126
+#: build/trans_presets.java:238 build/trans_presets.java:260
+#: build/trans_presets.java:281 build/trans_presets.java:302
+#: build/trans_presets.java:324 build/trans_presets.java:344
+#: build/trans_presets.java:366 build/trans_presets.java:402
+#: build/trans_presets.java:423 build/trans_presets.java:482
+#: build/trans_presets.java:503 build/trans_presets.java:519
+#: build/trans_presets.java:535 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:620
+#: build/trans_presets.java:645 build/trans_presets.java:669
+#: build/trans_presets.java:690 build/trans_presets.java:711
+#: build/trans_presets.java:731 build/trans_presets.java:741
+#: build/trans_presets.java:752 build/trans_presets.java:814
+#: build/trans_presets.java:832 build/trans_presets.java:841
+#: build/trans_presets.java:914 build/trans_presets.java:1073
+#: build/trans_presets.java:1081 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1108
+#: build/trans_presets.java:1117 build/trans_presets.java:1123
 #: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1143 build/trans_presets.java:1149
-#: build/trans_presets.java:1156 build/trans_presets.java:1166
-#: build/trans_presets.java:1172 build/trans_presets.java:1178
-#: build/trans_presets.java:1183 build/trans_presets.java:1189
-#: build/trans_presets.java:1197 build/trans_presets.java:1206
-#: build/trans_presets.java:1213 build/trans_presets.java:1219
-#: build/trans_presets.java:1236 build/trans_presets.java:1243
-#: build/trans_presets.java:1250 build/trans_presets.java:1347
-#: build/trans_presets.java:1398 build/trans_presets.java:1404
-#: build/trans_presets.java:1410 build/trans_presets.java:1416
-#: build/trans_presets.java:1423 build/trans_presets.java:1429
-#: build/trans_presets.java:1434 build/trans_presets.java:1444
-#: build/trans_presets.java:1465 build/trans_presets.java:1497
-#: build/trans_presets.java:1507 build/trans_presets.java:1513
-#: build/trans_presets.java:1521 build/trans_presets.java:1537
-#: build/trans_presets.java:1546 build/trans_presets.java:1556
-#: build/trans_presets.java:1565 build/trans_presets.java:1589
-#: build/trans_presets.java:1597 build/trans_presets.java:1611
-#: build/trans_presets.java:1622 build/trans_presets.java:1632
-#: build/trans_presets.java:1642 build/trans_presets.java:1662
-#: build/trans_presets.java:1674 build/trans_presets.java:1685
-#: build/trans_presets.java:1705 build/trans_presets.java:1720
-#: build/trans_presets.java:1728 build/trans_presets.java:1785
-#: build/trans_presets.java:1802 build/trans_presets.java:1820
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1888
-#: build/trans_presets.java:1906 build/trans_presets.java:1928
-#: build/trans_presets.java:1947 build/trans_presets.java:1968
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2023 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2075
-#: build/trans_presets.java:2091 build/trans_presets.java:2098
-#: build/trans_presets.java:2106 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2138
-#: build/trans_presets.java:2153 build/trans_presets.java:2163
-#: build/trans_presets.java:2175 build/trans_presets.java:2185
-#: build/trans_presets.java:2192 build/trans_presets.java:2201
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2225 build/trans_presets.java:2235
-#: build/trans_presets.java:2240 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2263
-#: build/trans_presets.java:2272 build/trans_presets.java:2279
-#: build/trans_presets.java:2286 build/trans_presets.java:2292
-#: build/trans_presets.java:2300 build/trans_presets.java:2310
-#: build/trans_presets.java:2322 build/trans_presets.java:2328
-#: build/trans_presets.java:2335 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2357
-#: build/trans_presets.java:2365 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2386
-#: build/trans_presets.java:2392 build/trans_presets.java:2398
-#: build/trans_presets.java:2404 build/trans_presets.java:2411
-#: build/trans_presets.java:2421 build/trans_presets.java:2427
-#: build/trans_presets.java:2435 build/trans_presets.java:2443
-#: build/trans_presets.java:2451 build/trans_presets.java:2478
-#: build/trans_presets.java:2556 build/trans_presets.java:2574
-#: build/trans_presets.java:2584 build/trans_presets.java:2599
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2626 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2649
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java: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:2715 build/trans_presets.java:2721
-#: build/trans_presets.java:2727 build/trans_presets.java:2734
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2757 build/trans_presets.java:2763
-#: build/trans_presets.java:2769 build/trans_presets.java:2775
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:2793 build/trans_presets.java:2799
-#: build/trans_presets.java:2807 build/trans_presets.java:2816
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2847 build/trans_presets.java:2853
-#: build/trans_presets.java:2859 build/trans_presets.java:2865
-#: build/trans_presets.java:2871 build/trans_presets.java:2877
-#: build/trans_presets.java:2883 build/trans_presets.java:2891
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2935
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
-#: build/trans_presets.java:2965 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2992
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3021 build/trans_presets.java:3030
-#: build/trans_presets.java:3037 build/trans_presets.java:3044
-#: build/trans_presets.java:3050 build/trans_presets.java:3057
-#: build/trans_presets.java:3063 build/trans_presets.java:3077
-#: build/trans_presets.java:3087 build/trans_presets.java:3093
-#: build/trans_presets.java:3106 build/trans_presets.java:3113
-#: build/trans_presets.java:3169 build/trans_presets.java:3175
-#: build/trans_presets.java:3183 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3208 build/trans_presets.java:3213
-#: build/trans_presets.java:3218 build/trans_presets.java:3223
-#: build/trans_presets.java:3232 build/trans_presets.java:3239
-#: build/trans_presets.java:3246 build/trans_presets.java:3254
-#: build/trans_presets.java:3261 build/trans_presets.java:3269
-#: build/trans_presets.java:3278 build/trans_presets.java:3286
-#: build/trans_presets.java:3295 build/trans_presets.java:3304
-#: build/trans_presets.java:3311 build/trans_presets.java:3319
-#: build/trans_presets.java:3325 build/trans_presets.java:3333
-#: build/trans_presets.java:3341 build/trans_presets.java:3348
-#: build/trans_presets.java:3355 build/trans_presets.java:3361
-#: build/trans_presets.java:3369 build/trans_presets.java:3376
-#: build/trans_presets.java:3382 build/trans_presets.java:3390
-#: build/trans_presets.java:3399 build/trans_presets.java:3405
-#: build/trans_presets.java:3413 build/trans_presets.java:3422
-#: build/trans_presets.java:3429 build/trans_presets.java:3435
-#: build/trans_presets.java:3444 build/trans_presets.java:3453
-#: build/trans_presets.java:3469 build/trans_presets.java:3478
-#: build/trans_presets.java:3486 build/trans_presets.java:3492
-#: build/trans_presets.java:3498 build/trans_presets.java:3506
-#: build/trans_presets.java:3515 build/trans_presets.java:3524
-#: build/trans_presets.java:3531 build/trans_presets.java:3539
-#: build/trans_presets.java:3546 build/trans_presets.java:3554
-#: build/trans_presets.java:3562 build/trans_presets.java:3570
-#: build/trans_presets.java:3579 build/trans_presets.java:3588
-#: build/trans_presets.java:3596 build/trans_presets.java:3604
-#: build/trans_presets.java:3611 build/trans_presets.java:3618
-#: build/trans_presets.java:3626 build/trans_presets.java:3633
-#: build/trans_presets.java:3641 build/trans_presets.java:3668
-#: build/trans_presets.java:3674 build/trans_presets.java:3680
-#: build/trans_presets.java:3686 build/trans_presets.java:3692
-#: build/trans_presets.java:3700 build/trans_presets.java:3707
-#: build/trans_presets.java:3714 build/trans_presets.java:3721
-#: build/trans_presets.java:3728 build/trans_presets.java:3736
+#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:1164 build/trans_presets.java:1171
+#: build/trans_presets.java:1176 build/trans_presets.java:1182
+#: build/trans_presets.java:1189 build/trans_presets.java:1199
+#: build/trans_presets.java:1205 build/trans_presets.java:1211
+#: build/trans_presets.java:1216 build/trans_presets.java:1222
+#: build/trans_presets.java:1230 build/trans_presets.java:1239
+#: build/trans_presets.java:1246 build/trans_presets.java:1252
+#: build/trans_presets.java:1269 build/trans_presets.java:1276
+#: build/trans_presets.java:1283 build/trans_presets.java:1380
+#: build/trans_presets.java:1432 build/trans_presets.java:1446
+#: build/trans_presets.java:1457 build/trans_presets.java:1470
+#: build/trans_presets.java:1483 build/trans_presets.java:1497
+#: build/trans_presets.java:1508 build/trans_presets.java:1519
+#: build/trans_presets.java:1530 build/trans_presets.java:1541
+#: build/trans_presets.java:1551 build/trans_presets.java:1562
+#: build/trans_presets.java:1568 build/trans_presets.java:1578
+#: build/trans_presets.java:1599 build/trans_presets.java:1631
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1655 build/trans_presets.java:1671
+#: build/trans_presets.java:1680 build/trans_presets.java:1690
+#: build/trans_presets.java:1699 build/trans_presets.java:1723
+#: build/trans_presets.java:1731 build/trans_presets.java:1745
+#: build/trans_presets.java:1756 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:1796
+#: build/trans_presets.java:1808 build/trans_presets.java:1819
+#: build/trans_presets.java:1839 build/trans_presets.java:1854
+#: build/trans_presets.java:1862 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1954
+#: build/trans_presets.java:1971 build/trans_presets.java:1988
+#: build/trans_presets.java:2005 build/trans_presets.java:2022
+#: build/trans_presets.java:2040 build/trans_presets.java:2062
+#: build/trans_presets.java:2081 build/trans_presets.java:2102
+#: build/trans_presets.java:2121 build/trans_presets.java:2138
+#: build/trans_presets.java:2157 build/trans_presets.java:2175
+#: build/trans_presets.java:2192 build/trans_presets.java:2209
+#: build/trans_presets.java:2225 build/trans_presets.java:2232
+#: build/trans_presets.java:2240 build/trans_presets.java:2247
+#: build/trans_presets.java:2264 build/trans_presets.java:2272
+#: build/trans_presets.java:2287 build/trans_presets.java:2297
+#: build/trans_presets.java:2309 build/trans_presets.java:2319
+#: build/trans_presets.java:2326 build/trans_presets.java:2335
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2359 build/trans_presets.java:2369
+#: build/trans_presets.java:2374 build/trans_presets.java:2382
+#: build/trans_presets.java:2389 build/trans_presets.java:2397
+#: build/trans_presets.java:2406 build/trans_presets.java:2413
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2434 build/trans_presets.java:2445
+#: build/trans_presets.java:2457 build/trans_presets.java:2463
+#: build/trans_presets.java:2470 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2513 build/trans_presets.java:2521
+#: build/trans_presets.java:2527 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2546
+#: build/trans_presets.java:2556 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2583 build/trans_presets.java:2591
+#: build/trans_presets.java:2623 build/trans_presets.java:2701
+#: build/trans_presets.java:2719 build/trans_presets.java:2729
+#: build/trans_presets.java:2744 build/trans_presets.java:2753
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:2806 build/trans_presets.java:2812
+#: build/trans_presets.java:2818 build/trans_presets.java:2824
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2854 build/trans_presets.java:2860
+#: build/trans_presets.java:2866 build/trans_presets.java:2872
+#: build/trans_presets.java:2879 build/trans_presets.java:2888
+#: build/trans_presets.java:2896 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2914
+#: build/trans_presets.java:2920 build/trans_presets.java:2926
+#: build/trans_presets.java:2932 build/trans_presets.java:2938
+#: build/trans_presets.java:2944 build/trans_presets.java:2952
+#: build/trans_presets.java:2961 build/trans_presets.java:2968
+#: build/trans_presets.java:2974 build/trans_presets.java:2980
+#: build/trans_presets.java:2986 build/trans_presets.java:2992
+#: build/trans_presets.java:2998 build/trans_presets.java:3004
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3080 build/trans_presets.java:3095
+#: build/trans_presets.java:3102 build/trans_presets.java:3110
+#: build/trans_presets.java:3115 build/trans_presets.java:3130
+#: build/trans_presets.java:3137 build/trans_presets.java:3149
+#: build/trans_presets.java:3159 build/trans_presets.java:3166
+#: build/trans_presets.java:3175 build/trans_presets.java:3182
+#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3222 build/trans_presets.java:3232
+#: build/trans_presets.java:3238 build/trans_presets.java:3249
+#: build/trans_presets.java:3269 build/trans_presets.java:3325
+#: build/trans_presets.java:3331 build/trans_presets.java:3339
+#: build/trans_presets.java:3346 build/trans_presets.java:3352
+#: build/trans_presets.java:3358 build/trans_presets.java:3364
+#: build/trans_presets.java:3369 build/trans_presets.java:3374
+#: build/trans_presets.java:3379 build/trans_presets.java:3388
+#: build/trans_presets.java:3395 build/trans_presets.java:3402
+#: build/trans_presets.java:3410 build/trans_presets.java:3417
+#: build/trans_presets.java:3425 build/trans_presets.java:3434
+#: build/trans_presets.java:3442 build/trans_presets.java:3451
+#: build/trans_presets.java:3460 build/trans_presets.java:3467
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3497
+#: build/trans_presets.java:3504 build/trans_presets.java:3511
+#: build/trans_presets.java:3517 build/trans_presets.java:3525
+#: build/trans_presets.java:3532 build/trans_presets.java:3538
+#: build/trans_presets.java:3546 build/trans_presets.java:3555
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3578 build/trans_presets.java:3585
+#: build/trans_presets.java:3591 build/trans_presets.java:3600
+#: build/trans_presets.java:3609 build/trans_presets.java:3625
+#: build/trans_presets.java:3634 build/trans_presets.java:3642
+#: build/trans_presets.java:3648 build/trans_presets.java:3654
+#: build/trans_presets.java:3662 build/trans_presets.java:3671
+#: build/trans_presets.java:3680 build/trans_presets.java:3687
+#: build/trans_presets.java:3695 build/trans_presets.java:3702
+#: build/trans_presets.java:3710 build/trans_presets.java:3718
+#: build/trans_presets.java:3726 build/trans_presets.java:3735
 #: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3759 build/trans_presets.java:3766
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3792 build/trans_presets.java:3800
-#: build/trans_presets.java:3808 build/trans_presets.java:3817
-#: build/trans_presets.java:3825 build/trans_presets.java:3835
-#: build/trans_presets.java:3845 build/trans_presets.java:3854
-#: build/trans_presets.java:3860 build/trans_presets.java:3866
-#: build/trans_presets.java:3872 build/trans_presets.java:3877
-#: build/trans_presets.java:3883 build/trans_presets.java:3893
-#: build/trans_presets.java:3899 build/trans_presets.java:3905
-#: build/trans_presets.java:3911 build/trans_presets.java:3918
-#: build/trans_presets.java:3925 build/trans_presets.java:3931
-#: build/trans_presets.java:3937 build/trans_presets.java:3944
-#: build/trans_presets.java:3950 build/trans_presets.java:3955
-#: build/trans_presets.java:3962 build/trans_presets.java:3969
-#: build/trans_presets.java:3975 build/trans_presets.java:3984
-#: build/trans_presets.java:3992 build/trans_presets.java:3998
-#: build/trans_presets.java:4004 build/trans_presets.java:4011
-#: build/trans_presets.java:4019 build/trans_presets.java:4025
-#: build/trans_presets.java:4032 build/trans_presets.java:4038
-#: build/trans_presets.java:4044 build/trans_presets.java:4050
-#: build/trans_presets.java:4056 build/trans_presets.java:4103
-#: build/trans_presets.java:4117 build/trans_presets.java:4136
-#: build/trans_presets.java:4150 build/trans_presets.java:4173
+#: build/trans_presets.java:3760 build/trans_presets.java:3767
+#: build/trans_presets.java:3774 build/trans_presets.java:3782
+#: build/trans_presets.java:3789 build/trans_presets.java:3797
+#: build/trans_presets.java:3824 build/trans_presets.java:3830
+#: build/trans_presets.java:3836 build/trans_presets.java:3842
+#: build/trans_presets.java:3848 build/trans_presets.java:3856
+#: build/trans_presets.java:3863 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3892 build/trans_presets.java:3900
+#: build/trans_presets.java:3908 build/trans_presets.java:3915
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3938 build/trans_presets.java:3947
+#: build/trans_presets.java:3955 build/trans_presets.java:3963
+#: build/trans_presets.java:3971 build/trans_presets.java:3980
+#: build/trans_presets.java:3988 build/trans_presets.java:3998
+#: build/trans_presets.java:4008 build/trans_presets.java:4017
+#: build/trans_presets.java:4023 build/trans_presets.java:4029
+#: build/trans_presets.java:4035 build/trans_presets.java:4040
+#: build/trans_presets.java:4046 build/trans_presets.java:4056
+#: build/trans_presets.java:4062 build/trans_presets.java:4068
+#: build/trans_presets.java:4074 build/trans_presets.java:4081
+#: build/trans_presets.java:4088 build/trans_presets.java:4094
+#: build/trans_presets.java:4100 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4118
+#: build/trans_presets.java:4125 build/trans_presets.java:4132
+#: build/trans_presets.java:4138 build/trans_presets.java:4147
+#: build/trans_presets.java:4155 build/trans_presets.java:4161
+#: build/trans_presets.java:4167 build/trans_presets.java:4174
+#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:4195 build/trans_presets.java:4201
+#: build/trans_presets.java:4207 build/trans_presets.java:4213
+#: build/trans_presets.java:4219 build/trans_presets.java:4266
+#: build/trans_presets.java:4280 build/trans_presets.java:4299
+#: build/trans_presets.java:4318 build/trans_presets.java:4348
+#: build/trans_presets.java:4373
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -9934,7 +10130,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:710
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:160
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309
@@ -9998,15 +10194,15 @@
 msgstr "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10015,62 +10211,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
-#: build/trans_presets.java:2588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
+#: build/trans_presets.java:2733
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:968
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1021
 msgid "Change relation"
 msgstr "Muuda seost"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+msgid "Delete from relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1079
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Abi siltide kasutamise kohta saab OSMi vikist (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1123
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1223
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1251
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10280,6 +10476,6 @@
 #. JButton
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:817
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:940
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:828
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:951
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:441
 msgid "Sort"
@@ -10782,13 +10978,13 @@
 #. item "Nature/Forest" combo "Type"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
-#: build/specialmessages.java:84 build/trans_presets.java:469
-#: build/trans_presets.java:766 build/trans_presets.java:775
-#: build/trans_presets.java:1167 build/trans_presets.java:1446
-#: build/trans_presets.java:1558 build/trans_presets.java:2312
-#: build/trans_presets.java:2537 build/trans_presets.java:2581
-#: build/trans_presets.java:2809 build/trans_presets.java:2818
-#: build/trans_presets.java:2978 build/trans_presets.java:3094
-#: build/trans_presets.java:3836 build/trans_presets.java:3846
-#: build/trans_presets.java:3855
+#: build/specialmessages.java:84 build/trans_presets.java:480
+#: build/trans_presets.java:787 build/trans_presets.java:796
+#: build/trans_presets.java:1200 build/trans_presets.java:1580
+#: build/trans_presets.java:1692 build/trans_presets.java:2447
+#: build/trans_presets.java:2682 build/trans_presets.java:2726
+#: build/trans_presets.java:2954 build/trans_presets.java:2963
+#: build/trans_presets.java:3123 build/trans_presets.java:3239
+#: build/trans_presets.java:3999 build/trans_presets.java:4009
+#: build/trans_presets.java:4018
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -10797,5 +10993,5 @@
 msgstr "Tüüp"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:43
 msgid "Slippy map"
 msgstr ""
@@ -10929,10 +11125,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -10940,5 +11136,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
 #, java-format
 msgid ""
@@ -10946,9 +11142,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:305
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
 #, java-format
 msgid ""
@@ -11608,18 +11804,18 @@
 #: build/trans_presets.java:117 build/trans_presets.java:135
 #: build/trans_presets.java:155 build/trans_presets.java:175
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:237 build/trans_presets.java:258
-#: build/trans_presets.java:285 build/trans_presets.java:305
-#: build/trans_presets.java:326 build/trans_presets.java:345
-#: build/trans_presets.java:366 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:477
-#: build/trans_presets.java:492 build/trans_presets.java:507
-#: build/trans_presets.java:531 build/trans_presets.java:570
-#: build/trans_presets.java:590 build/trans_presets.java:612
-#: build/trans_presets.java:635 build/trans_presets.java:659
-#: build/trans_presets.java:678 build/trans_presets.java:698
-#: build/trans_presets.java:1041 build/trans_presets.java:1049
-#: build/trans_presets.java:1057 build/trans_presets.java:1065
-#: build/trans_presets.java:1076 build/trans_presets.java:1353
+#: build/trans_presets.java:197 build/trans_presets.java:216
+#: build/trans_presets.java:239 build/trans_presets.java:261
+#: build/trans_presets.java:289 build/trans_presets.java:310
+#: build/trans_presets.java:332 build/trans_presets.java:352
+#: build/trans_presets.java:374 build/trans_presets.java:409
+#: build/trans_presets.java:430 build/trans_presets.java:488
+#: build/trans_presets.java:504 build/trans_presets.java:520
+#: build/trans_presets.java:545 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:629
+#: build/trans_presets.java:653 build/trans_presets.java:678
+#: build/trans_presets.java:698 build/trans_presets.java:719
+#: build/trans_presets.java:1074 build/trans_presets.java:1082
+#: build/trans_presets.java:1090 build/trans_presets.java:1098
+#: build/trans_presets.java:1109 build/trans_presets.java:1386
 msgid "Layer"
 msgstr ""
@@ -12069,6 +12265,6 @@
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:310
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
@@ -12078,6 +12274,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
@@ -12087,5 +12283,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
@@ -12096,7 +12292,9 @@
 
 #. item "Relations/Route" text "Description"
+#. item "Relations/Directional Route (North America)" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
-#: build/trans_presets.java:4153
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: build/trans_presets.java:4321 build/trans_presets.java:4351
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -12107,16 +12305,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:321
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
@@ -12125,6 +12325,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:318
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
@@ -12135,6 +12335,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:319
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
@@ -12145,11 +12345,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:317
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
@@ -12159,10 +12359,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12170,10 +12370,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -12184,7 +12384,31 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+msgid "Choose visible tracks"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:986
+msgid ""
+"<html>Select all tracks that you want to be displayed. You can drag select a "
+"range of tracks or use CTRL+Click to select specific ones. The map is "
+"updated live in the background. Open the URLs by double clicking them.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1004
+#, java-format
+msgid "Set track visibility for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+msgid "Show all"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+msgid "Show selected only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1276
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -12195,5 +12419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1062
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
@@ -12201,5 +12425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
@@ -12208,5 +12432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1071
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
@@ -12214,5 +12438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
@@ -12221,25 +12445,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1080
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1158
+msgid "Calculating Download Area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1262
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
@@ -12250,10 +12478,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1536
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
@@ -12262,5 +12490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1543
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
@@ -12269,15 +12497,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1714
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1731
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1747
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
@@ -12285,10 +12513,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1759
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1764
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
@@ -12299,6 +12527,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1861
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
@@ -12306,10 +12534,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1795
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1830
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
@@ -12317,10 +12545,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1849
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1854
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
@@ -12425,5 +12653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
 #, java-format
 msgid ""
@@ -12433,65 +12661,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:361
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372
 msgid "Show Errors"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:392
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
 msgid "Load All Error Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:454
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:465
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1310
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1312
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1314
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1318
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1401
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -14211,5 +14439,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1572
 msgid "Car"
 msgstr "Auto"
@@ -14218,4 +14446,6 @@
 #. item "Ways/Path" combo "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Cycle Barrier" check "Bicycle"
+#. item "Barriers/Block" check "Bicycle"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
@@ -14233,13 +14463,14 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:441 build/trans_presets.java:564
-#: build/trans_presets.java:843 build/trans_presets.java:862
-#: build/trans_presets.java:876 build/trans_presets.java:898
-#: build/trans_presets.java:935 build/trans_presets.java:948
-#: build/trans_presets.java:960 build/trans_presets.java:972
-#: build/trans_presets.java:984 build/trans_presets.java:996
-#: build/trans_presets.java:1006 build/trans_presets.java:1015
-#: build/trans_presets.java:1024 build/trans_presets.java:1584
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:452 build/trans_presets.java:579
+#: build/trans_presets.java:858 build/trans_presets.java:868
+#: build/trans_presets.java:877 build/trans_presets.java:889
+#: build/trans_presets.java:903 build/trans_presets.java:925
+#: build/trans_presets.java:968 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1017 build/trans_presets.java:1029
+#: build/trans_presets.java:1039 build/trans_presets.java:1048
+#: build/trans_presets.java:1057 build/trans_presets.java:1718
+#: build/trans_presets.java:1798
 msgid "Bicycle"
 msgstr "Jalgratas"
@@ -14249,4 +14480,8 @@
 #. <space />
 #. item "Barriers/Bollard" check "Foot"
+#. <space />
+#. item "Barriers/Cycle Barrier" check "Foot"
+#. <space />
+#. item "Barriers/Block" check "Foot"
 #. <space />
 #. item "Barriers/Cattle Grid" check "Foot"
@@ -14274,12 +14509,13 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:437 build/trans_presets.java:563
-#: build/trans_presets.java:842 build/trans_presets.java:861
-#: build/trans_presets.java:875 build/trans_presets.java:897
-#: build/trans_presets.java:934 build/trans_presets.java:947
-#: build/trans_presets.java:959 build/trans_presets.java:971
-#: build/trans_presets.java:983 build/trans_presets.java:995
-#: build/trans_presets.java:1005 build/trans_presets.java:1014
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:448 build/trans_presets.java:578
+#: build/trans_presets.java:857 build/trans_presets.java:867
+#: build/trans_presets.java:876 build/trans_presets.java:888
+#: build/trans_presets.java:902 build/trans_presets.java:924
+#: build/trans_presets.java:967 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1016 build/trans_presets.java:1028
+#: build/trans_presets.java:1038 build/trans_presets.java:1047
+#: build/trans_presets.java:1056
 msgid "Foot"
 msgstr ""
@@ -14535,5 +14771,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:496
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:502
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:39
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
@@ -15722,6 +15958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 #, java-format
 msgid ""
@@ -15730,6 +15965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:457
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
 #, java-format
 msgid ""
@@ -15738,59 +15972,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:939
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:976
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:943
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:944
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:945
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:966
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1100
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1029
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1101
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1030
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Kasuta eelseadet \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1081
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1221
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1158
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1269
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -15800,15 +16034,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1279
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1208
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1249
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1399
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -15818,22 +16052,22 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1404
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
 msgid "Selection unsuitable!"
 msgstr "Valik ei sobi!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
 msgid "Apply Preset"
 msgstr "Rakenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
 msgid "New relation"
 msgstr "Uus relatsioon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16198,10 +16432,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:243
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:242
 #, java-format
 msgid "Failed to rename file {0} to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:248
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:247
 #, java-format
 msgid "Failed to load {0}, use cached file and retry next time: {1}"
@@ -16209,5 +16443,5 @@
 
 #. I18n: argument is HTTP response code
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:300
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:299
 #, java-format
 msgid ""
@@ -16216,14 +16450,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:307
 msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:310
 #, java-format
 msgid "Download redirected to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:313
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
@@ -17066,6 +17300,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
-msgid ""
-"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+#, java-format
+msgid ""
+"Warning: Could not detect type of imagery source ''{0}''. Using default "
+"(xml)."
 msgstr ""
 
@@ -17850,5 +18086,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:602
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -18335,5 +18571,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:482
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:488
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33
 msgid "Refresh"
@@ -18652,21 +18888,26 @@
 msgstr ""
 
+#. Plugin merge-overlap
+#: build/trans_plugins.java:79
+msgid "Merge overlapping part of ways."
+msgstr ""
+
 #. Plugin michigan_left
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin namemanager
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
 #. Plugin native_password_manager
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "Use your system''s password manager to store the API username and password. "
@@ -18675,5 +18916,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -18683,15 +18924,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -18699,5 +18940,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -18705,10 +18946,10 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -18717,5 +18958,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:103
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18724,15 +18965,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:105
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin proj4j
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -18740,25 +18981,25 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:109
+#: build/trans_plugins.java:111
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -18768,5 +19009,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18775,10 +19016,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -18788,20 +19029,20 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:125 build/trans_plugins.java:127
+#: build/trans_plugins.java:127 build/trans_plugins.java:129
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:131
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18811,15 +19052,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -18828,5 +19069,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -18835,10 +19076,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -18846,5 +19087,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -18853,15 +19094,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -18871,5 +19112,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18878,20 +19119,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:161
+#: build/trans_plugins.java:163
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:163
+#: build/trans_plugins.java:165
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19052,11 +19293,13 @@
 #. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
+#. item "Relations/Directional Route (North America)" text "Reference"
 #: build/trans_presets.java:114 build/trans_presets.java:152
 #: build/trans_presets.java:173 build/trans_presets.java:194
-#: build/trans_presets.java:234 build/trans_presets.java:255
-#: build/trans_presets.java:1741 build/trans_presets.java:1749
-#: build/trans_presets.java:1757 build/trans_presets.java:1791
-#: build/trans_presets.java:2585 build/trans_presets.java:3115
-#: build/trans_presets.java:3131 build/trans_presets.java:4151
+#: build/trans_presets.java:236 build/trans_presets.java:258
+#: build/trans_presets.java:1875 build/trans_presets.java:1883
+#: build/trans_presets.java:1891 build/trans_presets.java:1925
+#: build/trans_presets.java:2730 build/trans_presets.java:3271
+#: build/trans_presets.java:3287 build/trans_presets.java:4319
+#: build/trans_presets.java:4349
 msgid "Reference"
 msgstr ""
@@ -19075,8 +19318,8 @@
 #: build/trans_presets.java:118 build/trans_presets.java:136
 #: build/trans_presets.java:156 build/trans_presets.java:176
-#: build/trans_presets.java:198 build/trans_presets.java:216
-#: build/trans_presets.java:238 build/trans_presets.java:259
-#: build/trans_presets.java:286 build/trans_presets.java:306
-#: build/trans_presets.java:478
+#: build/trans_presets.java:198 build/trans_presets.java:217
+#: build/trans_presets.java:240 build/trans_presets.java:262
+#: build/trans_presets.java:290 build/trans_presets.java:311
+#: build/trans_presets.java:489
 msgid "Lanes"
 msgstr "Rajad"
@@ -19103,12 +19346,12 @@
 #: build/trans_presets.java:119 build/trans_presets.java:137
 #: build/trans_presets.java:157 build/trans_presets.java:177
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:239 build/trans_presets.java:260
-#: build/trans_presets.java:287 build/trans_presets.java:307
-#: build/trans_presets.java:368 build/trans_presets.java:402
-#: build/trans_presets.java:423 build/trans_presets.java:452
-#: build/trans_presets.java:493 build/trans_presets.java:508
-#: build/trans_presets.java:571 build/trans_presets.java:591
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:200 build/trans_presets.java:219
+#: build/trans_presets.java:242 build/trans_presets.java:264
+#: build/trans_presets.java:291 build/trans_presets.java:312
+#: build/trans_presets.java:376 build/trans_presets.java:411
+#: build/trans_presets.java:433 build/trans_presets.java:463
+#: build/trans_presets.java:505 build/trans_presets.java:521
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:1388
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19149,15 +19392,15 @@
 #: build/trans_presets.java:120 build/trans_presets.java:138
 #: build/trans_presets.java:158 build/trans_presets.java:178
-#: build/trans_presets.java:200 build/trans_presets.java:218
-#: build/trans_presets.java:240 build/trans_presets.java:261
-#: build/trans_presets.java:278 build/trans_presets.java:299
-#: build/trans_presets.java:320 build/trans_presets.java:339
-#: build/trans_presets.java:359 build/trans_presets.java:381
-#: build/trans_presets.java:394 build/trans_presets.java:414
-#: build/trans_presets.java:432 build/trans_presets.java:472
-#: build/trans_presets.java:530 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:605
-#: build/trans_presets.java:629 build/trans_presets.java:652
-#: build/trans_presets.java:692 build/trans_presets.java:1348
+#: build/trans_presets.java:201 build/trans_presets.java:220
+#: build/trans_presets.java:243 build/trans_presets.java:265
+#: build/trans_presets.java:282 build/trans_presets.java:304
+#: build/trans_presets.java:326 build/trans_presets.java:346
+#: build/trans_presets.java:367 build/trans_presets.java:390
+#: build/trans_presets.java:403 build/trans_presets.java:424
+#: build/trans_presets.java:443 build/trans_presets.java:483
+#: build/trans_presets.java:544 build/trans_presets.java:577
+#: build/trans_presets.java:600 build/trans_presets.java:622
+#: build/trans_presets.java:647 build/trans_presets.java:671
+#: build/trans_presets.java:713 build/trans_presets.java:1381
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -19200,16 +19443,16 @@
 #: build/trans_presets.java:121 build/trans_presets.java:139
 #: build/trans_presets.java:160 build/trans_presets.java:180
-#: build/trans_presets.java:202 build/trans_presets.java:220
-#: build/trans_presets.java:241 build/trans_presets.java:262
-#: build/trans_presets.java:279 build/trans_presets.java:300
-#: build/trans_presets.java:321 build/trans_presets.java:340
-#: build/trans_presets.java:360 build/trans_presets.java:395
-#: build/trans_presets.java:415 build/trans_presets.java:473
-#: build/trans_presets.java:482 build/trans_presets.java:489
-#: build/trans_presets.java:525 build/trans_presets.java:557
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:630 build/trans_presets.java:653
-#: build/trans_presets.java:672 build/trans_presets.java:693
-#: build/trans_presets.java:1349 build/trans_surveyor.java:12
+#: build/trans_presets.java:203 build/trans_presets.java:222
+#: build/trans_presets.java:244 build/trans_presets.java:266
+#: build/trans_presets.java:283 build/trans_presets.java:305
+#: build/trans_presets.java:327 build/trans_presets.java:347
+#: build/trans_presets.java:368 build/trans_presets.java:404
+#: build/trans_presets.java:425 build/trans_presets.java:484
+#: build/trans_presets.java:494 build/trans_presets.java:501
+#: build/trans_presets.java:539 build/trans_presets.java:572
+#: build/trans_presets.java:601 build/trans_presets.java:623
+#: build/trans_presets.java:648 build/trans_presets.java:672
+#: build/trans_presets.java:692 build/trans_presets.java:714
+#: build/trans_presets.java:1382 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Sild"
@@ -19244,15 +19487,15 @@
 #: build/trans_presets.java:122 build/trans_presets.java:140
 #: build/trans_presets.java:161 build/trans_presets.java:181
-#: build/trans_presets.java:203 build/trans_presets.java:221
-#: build/trans_presets.java:242 build/trans_presets.java:263
-#: build/trans_presets.java:280 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:341
-#: build/trans_presets.java:361 build/trans_presets.java:396
-#: build/trans_presets.java:416 build/trans_presets.java:474
-#: build/trans_presets.java:498 build/trans_presets.java:526
-#: build/trans_presets.java:558 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:631
-#: build/trans_presets.java:654 build/trans_presets.java:673
-#: build/trans_presets.java:694 build/trans_presets.java:1350
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:245 build/trans_presets.java:267
+#: build/trans_presets.java:284 build/trans_presets.java:306
+#: build/trans_presets.java:328 build/trans_presets.java:348
+#: build/trans_presets.java:369 build/trans_presets.java:405
+#: build/trans_presets.java:426 build/trans_presets.java:485
+#: build/trans_presets.java:511 build/trans_presets.java:540
+#: build/trans_presets.java:573 build/trans_presets.java:602
+#: build/trans_presets.java:624 build/trans_presets.java:649
+#: build/trans_presets.java:673 build/trans_presets.java:693
+#: build/trans_presets.java:715 build/trans_presets.java:1383
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19285,15 +19528,15 @@
 #: build/trans_presets.java:123 build/trans_presets.java:141
 #: build/trans_presets.java:162 build/trans_presets.java:182
-#: build/trans_presets.java:204 build/trans_presets.java:222
-#: build/trans_presets.java:243 build/trans_presets.java:264
-#: build/trans_presets.java:281 build/trans_presets.java:302
-#: build/trans_presets.java:323 build/trans_presets.java:342
-#: build/trans_presets.java:362 build/trans_presets.java:397
-#: build/trans_presets.java:417 build/trans_presets.java:475
-#: build/trans_presets.java:527 build/trans_presets.java:559
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:632 build/trans_presets.java:655
-#: build/trans_presets.java:674 build/trans_presets.java:695
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:246 build/trans_presets.java:268
+#: build/trans_presets.java:285 build/trans_presets.java:307
+#: build/trans_presets.java:329 build/trans_presets.java:349
+#: build/trans_presets.java:370 build/trans_presets.java:406
+#: build/trans_presets.java:427 build/trans_presets.java:486
+#: build/trans_presets.java:541 build/trans_presets.java:574
+#: build/trans_presets.java:603 build/trans_presets.java:625
+#: build/trans_presets.java:650 build/trans_presets.java:674
+#: build/trans_presets.java:694 build/trans_presets.java:716
+#: build/trans_presets.java:1384
 msgid "Cutting"
 msgstr ""
@@ -19326,15 +19569,15 @@
 #: build/trans_presets.java:124 build/trans_presets.java:142
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:205 build/trans_presets.java:223
-#: build/trans_presets.java:244 build/trans_presets.java:265
-#: build/trans_presets.java:282 build/trans_presets.java:303
-#: build/trans_presets.java:324 build/trans_presets.java:343
-#: build/trans_presets.java:363 build/trans_presets.java:398
-#: build/trans_presets.java:418 build/trans_presets.java:476
-#: build/trans_presets.java:528 build/trans_presets.java:560
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:633 build/trans_presets.java:656
-#: build/trans_presets.java:675 build/trans_presets.java:696
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:247 build/trans_presets.java:269
+#: build/trans_presets.java:286 build/trans_presets.java:308
+#: build/trans_presets.java:330 build/trans_presets.java:350
+#: build/trans_presets.java:371 build/trans_presets.java:407
+#: build/trans_presets.java:428 build/trans_presets.java:487
+#: build/trans_presets.java:542 build/trans_presets.java:575
+#: build/trans_presets.java:604 build/trans_presets.java:626
+#: build/trans_presets.java:651 build/trans_presets.java:675
+#: build/trans_presets.java:695 build/trans_presets.java:717
+#: build/trans_presets.java:1385
 msgid "Embankment"
 msgstr ""
@@ -19367,15 +19610,15 @@
 #: build/trans_presets.java:125 build/trans_presets.java:143
 #: build/trans_presets.java:164 build/trans_presets.java:184
-#: build/trans_presets.java:206 build/trans_presets.java:224
-#: build/trans_presets.java:245 build/trans_presets.java:266
-#: build/trans_presets.java:283 build/trans_presets.java:304
-#: build/trans_presets.java:325 build/trans_presets.java:344
-#: build/trans_presets.java:364 build/trans_presets.java:383
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:529 build/trans_presets.java:561
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:634 build/trans_presets.java:657
-#: build/trans_presets.java:676 build/trans_presets.java:697
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:248 build/trans_presets.java:270
+#: build/trans_presets.java:287 build/trans_presets.java:309
+#: build/trans_presets.java:331 build/trans_presets.java:351
+#: build/trans_presets.java:372 build/trans_presets.java:392
+#: build/trans_presets.java:408 build/trans_presets.java:429
+#: build/trans_presets.java:543 build/trans_presets.java:576
+#: build/trans_presets.java:605 build/trans_presets.java:627
+#: build/trans_presets.java:652 build/trans_presets.java:676
+#: build/trans_presets.java:696 build/trans_presets.java:718
+#: build/trans_presets.java:2339
 msgid "Lit"
 msgstr ""
@@ -19412,5 +19655,5 @@
 #. item "Highways/Streets/Primary Link" check "Motorroad"
 #: build/trans_presets.java:159 build/trans_presets.java:179
-#: build/trans_presets.java:201 build/trans_presets.java:219
+#: build/trans_presets.java:202 build/trans_presets.java:221
 msgid "Motorroad"
 msgstr ""
@@ -19447,7 +19690,187 @@
 msgstr ""
 
+#. item "Highways/Streets/Primary" combo "Incline"
+#. item "Highways/Streets/Primary Link" combo "Incline"
+#. item "Highways/Streets/Secondary" combo "Incline"
+#. item "Highways/Streets/Tertiary" combo "Incline"
+#. item "Highways/Streets/Unclassified" combo "Incline"
+#. item "Highways/Streets/Residential" combo "Incline"
+#. item "Highways/Streets/Living Street" combo "Incline"
+#. item "Highways/Streets/Pedestrian" combo "Incline"
+#. item "Highways/Streets/Service" combo "Incline"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline"
+#. item "Highways/Streets/Construction" combo "Incline"
+#. item "Highways/Streets/Roundabout" combo "Incline"
+#. item "Highways/Streets/Bridge" combo "Incline"
+#. item "Highways/Streets/Tunnel" combo "Incline"
+#. item "Ways/Track" combo "Incline"
+#. item "Ways/Path" combo "Incline"
+#. item "Ways/Dedicated Bridleway" combo "Incline"
+#. item "Ways/Dedicated Cycleway" combo "Incline"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline"
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline"
+#. item "Ways/Dedicated Footway" combo "Incline"
+#. item "Transport/Railway/Bus Guideway" combo "Incline"
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "Incline"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "10%"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "-10%"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "10°"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: build/trans_presets.java:435 build/trans_presets.java:491
+#: build/trans_presets.java:508 build/trans_presets.java:523
+#: build/trans_presets.java:551 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "-10°"
+msgstr ""
+
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:209
+#: build/trans_presets.java:210
 msgid "Primary Link"
 msgstr ""
@@ -19455,5 +19878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary_link" />
 #. item "Highways/Streets/Primary Link" label "Edit Primary Link"
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Edit Primary Link"
 msgstr ""
@@ -19465,5 +19888,5 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:227 build/trans_surveyor.java:80
+#: build/trans_presets.java:229 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -19473,5 +19896,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:231
+#: build/trans_presets.java:233
 msgid "Edit Secondary Road"
 msgstr ""
@@ -19479,5 +19902,5 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:248
+#: build/trans_presets.java:251
 msgid "Tertiary"
 msgstr ""
@@ -19487,5 +19910,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:252
+#: build/trans_presets.java:255
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -19497,5 +19920,5 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:269 build/trans_surveyor.java:84
+#: build/trans_presets.java:273 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -19505,5 +19928,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:273
+#: build/trans_presets.java:277
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -19513,6 +19936,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:284 build/trans_presets.java:365
-#: build/trans_presets.java:658 build/trans_presets.java:677
+#: build/trans_presets.java:288 build/trans_presets.java:373
+#: build/trans_presets.java:677 build/trans_presets.java:697
 msgid "Passing Places"
 msgstr ""
@@ -19539,15 +19962,15 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:288 build/trans_presets.java:309
-#: build/trans_presets.java:328 build/trans_presets.java:347
-#: build/trans_presets.java:369 build/trans_presets.java:403
-#: build/trans_presets.java:424 build/trans_presets.java:479
-#: build/trans_presets.java:495 build/trans_presets.java:509
-#: build/trans_presets.java:536 build/trans_presets.java:572
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:636 build/trans_presets.java:660
-#: build/trans_presets.java:679 build/trans_presets.java:699
-#: build/trans_presets.java:1356 build/trans_presets.java:1652
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:292 build/trans_presets.java:314
+#: build/trans_presets.java:334 build/trans_presets.java:354
+#: build/trans_presets.java:377 build/trans_presets.java:412
+#: build/trans_presets.java:434 build/trans_presets.java:490
+#: build/trans_presets.java:507 build/trans_presets.java:522
+#: build/trans_presets.java:550 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:630
+#: build/trans_presets.java:654 build/trans_presets.java:679
+#: build/trans_presets.java:699 build/trans_presets.java:720
+#: build/trans_presets.java:1389 build/trans_presets.java:1786
+#: build/trans_presets.java:1831
 msgid "Width (meters)"
 msgstr ""
@@ -19559,5 +19982,5 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:291 build/trans_surveyor.java:88
+#: build/trans_presets.java:296 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Tänav"
@@ -19566,5 +19989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:294
+#: build/trans_presets.java:299
 msgid "Edit Residential Street"
 msgstr "Lisa andmeid"
@@ -19586,12 +20009,12 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "Surface"
 msgstr ""
@@ -19613,12 +20036,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "paved"
 msgstr ""
@@ -19639,12 +20062,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "unpaved"
 msgstr ""
@@ -19665,12 +20088,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "asphalt"
 msgstr ""
@@ -19692,12 +20115,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "concrete"
 msgstr ""
@@ -19719,12 +20142,12 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354 build/trans_presets.java:2549
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387 build/trans_presets.java:2694
 msgid "metal"
 msgstr ""
@@ -19747,13 +20170,13 @@
 #. item "Leisure/Public Grill" combo "Fuel" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354 build/trans_presets.java:2250
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387 build/trans_presets.java:2384
+#: build/trans_presets.java:2694
 msgid "wood"
 msgstr "puit"
@@ -19774,12 +20197,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "paving_stones"
 msgstr ""
@@ -19801,12 +20224,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "cobblestone"
 msgstr ""
@@ -19828,12 +20251,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "gravel"
 msgstr ""
@@ -19854,12 +20277,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "pebblestone"
 msgstr ""
@@ -19880,12 +20303,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "compacted"
 msgstr ""
@@ -19906,12 +20329,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:570
+#: build/trans_presets.java:599 build/trans_presets.java:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "grass_paver"
 msgstr ""
@@ -19933,12 +20356,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "grass"
 msgstr ""
@@ -19960,12 +20383,12 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "sand"
 msgstr ""
@@ -19988,13 +20411,13 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: build/trans_presets.java:353 build/trans_presets.java:375
+#: build/trans_presets.java:391 build/trans_presets.java:410
+#: build/trans_presets.java:431 build/trans_presets.java:537
+#: build/trans_presets.java:570 build/trans_presets.java:599
+#: build/trans_presets.java:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:2663
 msgid "ground"
 msgstr "pinnas"
@@ -20002,5 +20425,5 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:312
+#: build/trans_presets.java:318
 msgid "Living Street"
 msgstr "Õueala"
@@ -20009,5 +20432,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
 #. item "Highways/Streets/Living Street" label "Edit Living Street"
-#: build/trans_presets.java:315
+#: build/trans_presets.java:321
 msgid "Edit Living Street"
 msgstr "Lisa andmeid"
@@ -20015,5 +20438,5 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:331
+#: build/trans_presets.java:338
 msgid "Pedestrian"
 msgstr ""
@@ -20022,5 +20445,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:341
 msgid "Edit Pedestrian Street"
 msgstr "Lisa andmeid"
@@ -20028,5 +20451,5 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:350
+#: build/trans_presets.java:358
 msgid "Service"
 msgstr "Teenindus"
@@ -20035,5 +20458,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:353
+#: build/trans_presets.java:361
 msgid "Edit Serviceway"
 msgstr "Lisa andmeid"
@@ -20043,20 +20466,20 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "alley"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "driveway"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "parking_aisle"
 msgstr ""
@@ -20064,5 +20487,5 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:381
 msgid "Parking Aisle"
 msgstr ""
@@ -20072,5 +20495,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
-#: build/trans_presets.java:376
+#: build/trans_presets.java:385
 msgid "Edit Parking Aisle"
 msgstr "Lisa andmeid"
@@ -20078,5 +20501,5 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:386
+#: build/trans_presets.java:395
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -20085,5 +20508,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
-#: build/trans_presets.java:389
+#: build/trans_presets.java:398
 msgid "Edit Road of unknown type"
 msgstr "Lisa andmeid"
@@ -20091,15 +20514,15 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:406
+#: build/trans_presets.java:416
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:417
 msgid "Edit Highway Under Construction"
 msgstr "Lisa andmeid"
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:422
+#: build/trans_presets.java:432
 msgid "Junction"
 msgstr ""
@@ -20145,10 +20568,10 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:422 build/trans_style.java:744
+#: build/trans_presets.java:432 build/trans_style.java:744
 msgid "roundabout"
 msgstr ""
 
 #. item "Highways/Streets/Construction" combo "Junction" display value
-#: build/trans_presets.java:422
+#: build/trans_presets.java:432
 msgid "jughandle"
 msgstr ""
@@ -20280,67 +20703,81 @@
 #. item "Facilities/Hunting Stand" combo "Lock" display value
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
-#: build/trans_presets.java:422 build/trans_presets.java:436
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:440 build/trans_presets.java:441
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:489
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:611
-#: build/trans_presets.java:775 build/trans_presets.java:1264
-#: build/trans_presets.java:1276 build/trans_presets.java:1288
-#: build/trans_presets.java:1300 build/trans_presets.java:1312
-#: build/trans_presets.java:1324 build/trans_presets.java:1336
-#: build/trans_presets.java:1447 build/trans_presets.java:1448
-#: build/trans_presets.java:1451 build/trans_presets.java:1452
-#: build/trans_presets.java:1453 build/trans_presets.java:1468
-#: build/trans_presets.java:1559 build/trans_presets.java:1571
-#: build/trans_presets.java:1572 build/trans_presets.java:1573
-#: build/trans_presets.java:1574 build/trans_presets.java:1575
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1806
-#: build/trans_presets.java:1807 build/trans_presets.java:1808
-#: build/trans_presets.java:1809 build/trans_presets.java:1824
-#: build/trans_presets.java:1825 build/trans_presets.java:1826
-#: build/trans_presets.java:1827 build/trans_presets.java:1840
-#: build/trans_presets.java:1841 build/trans_presets.java:1842
-#: build/trans_presets.java:1843 build/trans_presets.java:1857
-#: build/trans_presets.java:1858 build/trans_presets.java:1859
-#: build/trans_presets.java:1860 build/trans_presets.java:1875
-#: build/trans_presets.java:1876 build/trans_presets.java:1877
-#: build/trans_presets.java:1878 build/trans_presets.java:1892
-#: build/trans_presets.java:1893 build/trans_presets.java:1894
-#: build/trans_presets.java:1895 build/trans_presets.java:1909
-#: build/trans_presets.java:1910 build/trans_presets.java:1911
-#: build/trans_presets.java:1912 build/trans_presets.java:1915
-#: build/trans_presets.java:1931 build/trans_presets.java:1932
-#: build/trans_presets.java:1933 build/trans_presets.java:1934
-#: build/trans_presets.java:1954 build/trans_presets.java:1955
-#: build/trans_presets.java:1956 build/trans_presets.java:1957
-#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:432 build/trans_presets.java:447
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:451 build/trans_presets.java:452
+#: build/trans_presets.java:453 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: build/trans_presets.java:457 build/trans_presets.java:459
+#: build/trans_presets.java:460 build/trans_presets.java:461
+#: build/trans_presets.java:462 build/trans_presets.java:501
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:581
+#: build/trans_presets.java:582 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:628
+#: build/trans_presets.java:796 build/trans_presets.java:1297
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1581 build/trans_presets.java:1582
+#: build/trans_presets.java:1585 build/trans_presets.java:1586
+#: build/trans_presets.java:1587 build/trans_presets.java:1602
+#: build/trans_presets.java:1693 build/trans_presets.java:1705
+#: build/trans_presets.java:1706 build/trans_presets.java:1707
+#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1820 build/trans_presets.java:1821
+#: build/trans_presets.java:1822 build/trans_presets.java:1940
+#: build/trans_presets.java:1941 build/trans_presets.java:1942
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
+#: build/trans_presets.java:1959 build/trans_presets.java:1960
+#: build/trans_presets.java:1961 build/trans_presets.java:1974
 #: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:1977 build/trans_presets.java:1991
 #: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2030 build/trans_presets.java:2031
+#: build/trans_presets.java:1994 build/trans_presets.java:2009
+#: build/trans_presets.java:2010 build/trans_presets.java:2011
+#: build/trans_presets.java:2012 build/trans_presets.java:2026
+#: build/trans_presets.java:2027 build/trans_presets.java:2028
+#: build/trans_presets.java:2029 build/trans_presets.java:2043
 #: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2047
-#: build/trans_presets.java:2061 build/trans_presets.java:2062
-#: build/trans_presets.java:2063 build/trans_presets.java:2064
-#: build/trans_presets.java:2078 build/trans_presets.java:2079
-#: build/trans_presets.java:2157 build/trans_presets.java:2167
-#: build/trans_presets.java:2228 build/trans_presets.java:2249
-#: build/trans_presets.java:2434 build/trans_presets.java:2489
-#: build/trans_presets.java:2490 build/trans_presets.java:2548
-#: build/trans_presets.java:2564 build/trans_presets.java:2565
-#: build/trans_presets.java:2566 build/trans_presets.java:2997
+#: build/trans_presets.java:2046 build/trans_presets.java:2049
+#: build/trans_presets.java:2065 build/trans_presets.java:2066
+#: build/trans_presets.java:2067 build/trans_presets.java:2068
+#: build/trans_presets.java:2088 build/trans_presets.java:2089
+#: build/trans_presets.java:2090 build/trans_presets.java:2091
+#: build/trans_presets.java:2107 build/trans_presets.java:2108
+#: build/trans_presets.java:2109 build/trans_presets.java:2110
+#: build/trans_presets.java:2124 build/trans_presets.java:2125
+#: build/trans_presets.java:2126 build/trans_presets.java:2127
+#: build/trans_presets.java:2143 build/trans_presets.java:2144
+#: build/trans_presets.java:2145 build/trans_presets.java:2146
+#: build/trans_presets.java:2162 build/trans_presets.java:2163
+#: build/trans_presets.java:2164 build/trans_presets.java:2165
+#: build/trans_presets.java:2178 build/trans_presets.java:2179
+#: build/trans_presets.java:2180 build/trans_presets.java:2181
+#: build/trans_presets.java:2195 build/trans_presets.java:2196
+#: build/trans_presets.java:2197 build/trans_presets.java:2198
+#: build/trans_presets.java:2212 build/trans_presets.java:2213
+#: build/trans_presets.java:2291 build/trans_presets.java:2301
+#: build/trans_presets.java:2362 build/trans_presets.java:2383
+#: build/trans_presets.java:2582 build/trans_presets.java:2634
+#: build/trans_presets.java:2635 build/trans_presets.java:2693
+#: build/trans_presets.java:2709 build/trans_presets.java:2710
+#: build/trans_presets.java:2711 build/trans_presets.java:3142
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -20351,5 +20788,5 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:428
+#: build/trans_presets.java:439
 msgid "Road Restrictions"
 msgstr ""
@@ -20358,25 +20795,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:431
+#: build/trans_presets.java:442
 msgid "Edit Road Restrictions"
 msgstr "Lisa andmeid"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:433
+#: build/trans_presets.java:444
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:434
+#: build/trans_presets.java:445
 msgid "No exit (cul-de-sac)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" label "Transport mode restrictions"
-#: build/trans_presets.java:435
+#: build/trans_presets.java:446
 msgid "Transport mode restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access"
-#: build/trans_presets.java:436
+#: build/trans_presets.java:447
 msgid "General Access"
 msgstr ""
@@ -20409,15 +20846,15 @@
 #. <condition k="access" v="destination"/>
 #. color destination
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:568
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 build/trans_presets.java:453
+#: build/trans_presets.java:454 build/trans_presets.java:455
+#: build/trans_presets.java:456 build/trans_presets.java:457
+#: build/trans_presets.java:459 build/trans_presets.java:460
+#: build/trans_presets.java:461 build/trans_presets.java:462
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:583
 #: build/trans_style.java:179
 msgid "destination"
@@ -20442,13 +20879,13 @@
 #. item "Ways/Path" combo "Horse" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:568
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 build/trans_presets.java:453
+#: build/trans_presets.java:454 build/trans_presets.java:455
+#: build/trans_presets.java:456 build/trans_presets.java:457
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:583
 msgid "delivery"
 msgstr ""
@@ -20491,16 +20928,16 @@
 #. <condition k="access" v="permissive"/>
 #. color permissive
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:2228
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 build/trans_presets.java:453
+#: build/trans_presets.java:454 build/trans_presets.java:455
+#: build/trans_presets.java:456 build/trans_presets.java:457
+#: build/trans_presets.java:459 build/trans_presets.java:460
+#: build/trans_presets.java:461 build/trans_presets.java:462
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:582
+#: build/trans_presets.java:583 build/trans_presets.java:2362
 #: build/trans_style.java:169
 msgid "permissive"
@@ -20536,16 +20973,16 @@
 #. <condition k="access" v="private"/>
 #. color private
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:2228
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 build/trans_presets.java:453
+#: build/trans_presets.java:454 build/trans_presets.java:455
+#: build/trans_presets.java:456 build/trans_presets.java:457
+#: build/trans_presets.java:459 build/trans_presets.java:460
+#: build/trans_presets.java:461 build/trans_presets.java:462
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:582
+#: build/trans_presets.java:583 build/trans_presets.java:2362
 #: build/trans_style.java:174
 msgid "private"
@@ -20563,10 +21000,10 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:436 build/trans_presets.java:440
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535
+#: build/trans_presets.java:447 build/trans_presets.java:451
+#: build/trans_presets.java:453 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: build/trans_presets.java:457 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549
 msgid "agricultural"
 msgstr ""
@@ -20583,10 +21020,10 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:436 build/trans_presets.java:440
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535
+#: build/trans_presets.java:447 build/trans_presets.java:451
+#: build/trans_presets.java:453 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: build/trans_presets.java:457 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549
 msgid "forestry"
 msgstr ""
@@ -20719,69 +21156,68 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:566 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:569
-#: build/trans_presets.java:611 build/trans_presets.java:744
-#: build/trans_presets.java:766 build/trans_presets.java:1264
-#: build/trans_presets.java:1276 build/trans_presets.java:1288
-#: build/trans_presets.java:1300 build/trans_presets.java:1312
-#: build/trans_presets.java:1324 build/trans_presets.java:1336
-#: build/trans_presets.java:1378 build/trans_presets.java:1447
-#: build/trans_presets.java:1448 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:1468 build/trans_presets.java:1559
-#: build/trans_presets.java:1571 build/trans_presets.java:1572
-#: build/trans_presets.java:1573 build/trans_presets.java:1574
-#: build/trans_presets.java:1575 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1806 build/trans_presets.java:1807
-#: build/trans_presets.java:1808 build/trans_presets.java:1809
-#: build/trans_presets.java:1824 build/trans_presets.java:1825
-#: build/trans_presets.java:1826 build/trans_presets.java:1827
-#: build/trans_presets.java:1840 build/trans_presets.java:1841
-#: build/trans_presets.java:1842 build/trans_presets.java:1843
-#: build/trans_presets.java:1857 build/trans_presets.java:1858
-#: build/trans_presets.java:1859 build/trans_presets.java:1860
-#: build/trans_presets.java:1875 build/trans_presets.java:1876
-#: build/trans_presets.java:1877 build/trans_presets.java:1878
-#: build/trans_presets.java:1892 build/trans_presets.java:1893
-#: build/trans_presets.java:1894 build/trans_presets.java:1895
-#: build/trans_presets.java:1909 build/trans_presets.java:1910
-#: build/trans_presets.java:1911 build/trans_presets.java:1912
-#: build/trans_presets.java:1915 build/trans_presets.java:1931
-#: build/trans_presets.java:1932 build/trans_presets.java:1933
-#: build/trans_presets.java:1934 build/trans_presets.java:1954
-#: build/trans_presets.java:1955 build/trans_presets.java:1956
-#: build/trans_presets.java:1957 build/trans_presets.java:1973
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 build/trans_presets.java:453
+#: build/trans_presets.java:454 build/trans_presets.java:455
+#: build/trans_presets.java:456 build/trans_presets.java:457
+#: build/trans_presets.java:459 build/trans_presets.java:460
+#: build/trans_presets.java:461 build/trans_presets.java:462
+#: build/trans_presets.java:546 build/trans_presets.java:547
+#: build/trans_presets.java:548 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:578
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:582
+#: build/trans_presets.java:583 build/trans_presets.java:584
+#: build/trans_presets.java:628 build/trans_presets.java:765
+#: build/trans_presets.java:787 build/trans_presets.java:1297
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1412 build/trans_presets.java:1581
+#: build/trans_presets.java:1582 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:1602 build/trans_presets.java:1693
+#: build/trans_presets.java:1705 build/trans_presets.java:1706
+#: build/trans_presets.java:1707 build/trans_presets.java:1708
+#: build/trans_presets.java:1709 build/trans_presets.java:1820
+#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1940 build/trans_presets.java:1941
+#: build/trans_presets.java:1942 build/trans_presets.java:1943
+#: build/trans_presets.java:1958 build/trans_presets.java:1959
+#: build/trans_presets.java:1960 build/trans_presets.java:1961
 #: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1990
+#: build/trans_presets.java:1976 build/trans_presets.java:1977
 #: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2030
-#: build/trans_presets.java:2031 build/trans_presets.java:2044
+#: build/trans_presets.java:1993 build/trans_presets.java:1994
+#: build/trans_presets.java:2009 build/trans_presets.java:2010
+#: build/trans_presets.java:2011 build/trans_presets.java:2012
+#: build/trans_presets.java:2026 build/trans_presets.java:2027
+#: build/trans_presets.java:2028 build/trans_presets.java:2029
+#: build/trans_presets.java:2043 build/trans_presets.java:2044
 #: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2047 build/trans_presets.java:2061
-#: build/trans_presets.java:2062 build/trans_presets.java:2063
-#: build/trans_presets.java:2064 build/trans_presets.java:2078
-#: build/trans_presets.java:2079 build/trans_presets.java:2157
-#: build/trans_presets.java:2167 build/trans_presets.java:2249
-#: build/trans_presets.java:2434 build/trans_presets.java:2489
-#: build/trans_presets.java:2490 build/trans_presets.java:2548
-#: build/trans_presets.java:2564 build/trans_presets.java:2565
-#: build/trans_presets.java:2566 build/trans_presets.java:2997
-#: build/trans_presets.java:3080 build/trans_presets.java:3081
+#: build/trans_presets.java:2049 build/trans_presets.java:2065
+#: build/trans_presets.java:2066 build/trans_presets.java:2067
+#: build/trans_presets.java:2068 build/trans_presets.java:2088
+#: build/trans_presets.java:2089 build/trans_presets.java:2090
+#: build/trans_presets.java:2091 build/trans_presets.java:2107
+#: build/trans_presets.java:2108 build/trans_presets.java:2109
+#: build/trans_presets.java:2110 build/trans_presets.java:2124
+#: build/trans_presets.java:2125 build/trans_presets.java:2126
+#: build/trans_presets.java:2127 build/trans_presets.java:2143
+#: build/trans_presets.java:2144 build/trans_presets.java:2145
+#: build/trans_presets.java:2146 build/trans_presets.java:2162
+#: build/trans_presets.java:2163 build/trans_presets.java:2164
+#: build/trans_presets.java:2165 build/trans_presets.java:2178
+#: build/trans_presets.java:2179 build/trans_presets.java:2180
+#: build/trans_presets.java:2181 build/trans_presets.java:2195
+#: build/trans_presets.java:2196 build/trans_presets.java:2197
+#: build/trans_presets.java:2198 build/trans_presets.java:2212
+#: build/trans_presets.java:2213 build/trans_presets.java:2291
+#: build/trans_presets.java:2301 build/trans_presets.java:2383
+#: build/trans_presets.java:2582 build/trans_presets.java:2634
+#: build/trans_presets.java:2635 build/trans_presets.java:2693
+#: build/trans_presets.java:2709 build/trans_presets.java:2710
+#: build/trans_presets.java:2711 build/trans_presets.java:3142
+#: build/trans_presets.java:3225
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -20810,15 +21246,15 @@
 #. item "Ways/Path" combo "Ski" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:441 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:566 build/trans_presets.java:567
-#: build/trans_presets.java:568
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:452 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: build/trans_presets.java:457 build/trans_presets.java:459
+#: build/trans_presets.java:460 build/trans_presets.java:461
+#: build/trans_presets.java:462 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:578
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:582
+#: build/trans_presets.java:583
 msgid "official"
 msgstr ""
@@ -20845,15 +21281,15 @@
 #. item "Ways/Path" combo "Snowmobile" display value
 #. item "Ways/Path" combo "Motorcar" display value
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:441 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:569
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:452 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: build/trans_presets.java:457 build/trans_presets.java:459
+#: build/trans_presets.java:460 build/trans_presets.java:461
+#: build/trans_presets.java:462 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:578
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:582 build/trans_presets.java:583
+#: build/trans_presets.java:584
 msgid "designated"
 msgstr ""
@@ -20862,4 +21298,6 @@
 #. item "Ways/Path" combo "Horse"
 #. item "Barriers/Bollard" check "Horse"
+#. item "Barriers/Cycle Barrier" check "Horse"
+#. item "Barriers/Block" check "Horse"
 #. item "Barriers/Spikes" check "Horse"
 #. item "Barriers/Border Control" check "Horse"
@@ -20870,20 +21308,21 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:438 build/trans_presets.java:565
-#: build/trans_presets.java:844 build/trans_presets.java:877
-#: build/trans_presets.java:899 build/trans_presets.java:936
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:449 build/trans_presets.java:580
+#: build/trans_presets.java:859 build/trans_presets.java:869
+#: build/trans_presets.java:878 build/trans_presets.java:904
+#: build/trans_presets.java:926 build/trans_presets.java:969
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1006 build/trans_presets.java:1018
+#: build/trans_presets.java:1058
 msgid "Horse"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" label "Vehicles per type"
-#: build/trans_presets.java:439
+#: build/trans_presets.java:450
 msgid "Vehicles per type"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "All vehicles"
-#: build/trans_presets.java:440
+#: build/trans_presets.java:451
 msgid "All vehicles"
 msgstr ""
@@ -20891,5 +21330,5 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motor vehicles"
 #. item "Ways/Track" combo "Motor vehicles"
-#: build/trans_presets.java:442 build/trans_presets.java:533
+#: build/trans_presets.java:453 build/trans_presets.java:547
 msgid "Motor vehicles"
 msgstr ""
@@ -20898,4 +21337,6 @@
 #. item "Ways/Track" combo "Motorcycle"
 #. item "Barriers/Bollard" check "Motorcycle"
+#. item "Barriers/Cycle Barrier" check "Motorcycle"
+#. item "Barriers/Block" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
@@ -20908,11 +21349,12 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:443 build/trans_presets.java:534
-#: build/trans_presets.java:845 build/trans_presets.java:863
-#: build/trans_presets.java:878 build/trans_presets.java:900
-#: build/trans_presets.java:937 build/trans_presets.java:950
-#: build/trans_presets.java:962 build/trans_presets.java:974
-#: build/trans_presets.java:986 build/trans_presets.java:1026
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:454 build/trans_presets.java:548
+#: build/trans_presets.java:860 build/trans_presets.java:870
+#: build/trans_presets.java:879 build/trans_presets.java:890
+#: build/trans_presets.java:905 build/trans_presets.java:927
+#: build/trans_presets.java:970 build/trans_presets.java:983
+#: build/trans_presets.java:995 build/trans_presets.java:1007
+#: build/trans_presets.java:1019 build/trans_presets.java:1059
+#: build/trans_presets.java:1686
 msgid "Motorcycle"
 msgstr "Mootorratas"
@@ -20930,50 +21372,50 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:444 build/trans_presets.java:535
-#: build/trans_presets.java:569 build/trans_presets.java:864
-#: build/trans_presets.java:879 build/trans_presets.java:901
-#: build/trans_presets.java:938 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:1027
+#: build/trans_presets.java:455 build/trans_presets.java:549
+#: build/trans_presets.java:584 build/trans_presets.java:891
+#: build/trans_presets.java:906 build/trans_presets.java:928
+#: build/trans_presets.java:971 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1020 build/trans_presets.java:1060
 msgid "Motorcar"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Light Commercial Vehicles (goods)"
-#: build/trans_presets.java:445
+#: build/trans_presets.java:456
 msgid "Light Commercial Vehicles (goods)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:446
+#: build/trans_presets.java:457
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" label "Vehicles per use"
-#: build/trans_presets.java:447
+#: build/trans_presets.java:458
 msgid "Vehicles per use"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:448
+#: build/trans_presets.java:459
 msgid "Agricultural"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Emergency vehicles"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:460
 msgid "Emergency vehicles"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "High-occupancy vehicles (hov)"
-#: build/trans_presets.java:450
+#: build/trans_presets.java:461
 msgid "High-occupancy vehicles (hov)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:451
+#: build/trans_presets.java:462
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:453
+#: build/trans_presets.java:464
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -20981,25 +21423,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:454 build/trans_presets.java:494
+#: build/trans_presets.java:465 build/trans_presets.java:506
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:455
+#: build/trans_presets.java:466
 msgid "Max. axleload (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. height (meters)"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:467
 msgid "Max. height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. width (meters)"
-#: build/trans_presets.java:457
+#: build/trans_presets.java:468
 msgid "Max. width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. length (meters)"
-#: build/trans_presets.java:458
+#: build/trans_presets.java:469
 msgid "Max. length (meters)"
 msgstr ""
@@ -21007,5 +21449,5 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:461
+#: build/trans_presets.java:472
 msgid "Roundabout"
 msgstr ""
@@ -21016,5 +21458,5 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:466
+#: build/trans_presets.java:477
 msgid "Edit Junction"
 msgstr "Lisa andmeid"
@@ -21032,5 +21474,5 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:469 build/trans_style.java:417
+#: build/trans_presets.java:480 build/trans_style.java:417
 #: build/trans_style.java:423
 msgid "motorway"
@@ -21038,5 +21480,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "motorway_link"
 msgstr ""
@@ -21055,5 +21497,5 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:469 build/trans_style.java:429
+#: build/trans_presets.java:480 build/trans_style.java:429
 #: build/trans_style.java:435
 msgid "trunk"
@@ -21061,5 +21503,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "trunk_link"
 msgstr ""
@@ -21078,5 +21520,5 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:469 build/trans_style.java:441
+#: build/trans_presets.java:480 build/trans_style.java:441
 #: build/trans_style.java:447
 msgid "primary"
@@ -21084,5 +21526,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "primary_link"
 msgstr ""
@@ -21101,5 +21543,5 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:469 build/trans_style.java:453
+#: build/trans_presets.java:480 build/trans_style.java:453
 #: build/trans_style.java:459
 msgid "secondary"
@@ -21119,5 +21561,5 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:469 build/trans_style.java:465
+#: build/trans_presets.java:480 build/trans_style.java:465
 #: build/trans_style.java:471
 msgid "tertiary"
@@ -21125,5 +21567,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "unclassified"
 msgstr ""
@@ -21136,10 +21578,10 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:469 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_style.java:2748
 msgid "residential"
 msgstr ""
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "living_street"
 msgstr ""
@@ -21179,5 +21621,5 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:469 build/trans_style.java:513
+#: build/trans_presets.java:480 build/trans_style.java:513
 #: build/trans_style.java:3662
 msgid "service"
@@ -21185,5 +21627,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "bus_guideway"
 msgstr ""
@@ -21207,5 +21649,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:469 build/trans_style.java:698
+#: build/trans_presets.java:480 build/trans_style.java:698
 #: build/trans_style.java:2803 build/trans_style.java:2804
 msgid "construction"
@@ -21217,25 +21659,25 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:499
 msgid "Edit Bridge"
 msgstr "Lisa andmeid"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "viaduct"
 msgstr "viadukt"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "swing"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "aqueduct"
 msgstr "akvedukt"
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:499
+#: build/trans_presets.java:512
 msgid "Edit Tunnel"
 msgstr "Lisa andmeid"
@@ -21243,10 +21685,10 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:513
+#: build/trans_presets.java:527
 msgid "Ways"
 msgstr "Teed"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:514
+#: build/trans_presets.java:528
 msgid "Track"
 msgstr ""
@@ -21255,35 +21697,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:517
+#: build/trans_presets.java:531
 msgid "Edit Track"
 msgstr "Lisa andmeid"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade1"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade2"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade3"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade4"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade5"
 msgstr ""
@@ -21291,10 +21733,10 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:524 build/trans_presets.java:554
+#: build/trans_presets.java:538 build/trans_presets.java:569
 msgid "MTB Scale"
 msgstr ""
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:532
+#: build/trans_presets.java:546
 msgid "General access"
 msgstr ""
@@ -21302,5 +21744,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:539
+#: build/trans_presets.java:554
 msgid "Path"
 msgstr ""
@@ -21309,50 +21751,50 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:557
 msgid "Edit Path"
 msgstr "Lisa andmeid"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T1 - hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T2 - mountain hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T3 - difficult, exposed hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T5 - difficult alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:548
+#: build/trans_presets.java:563
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description
-#: build/trans_presets.java:549
+#: build/trans_presets.java:564
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -21361,5 +21803,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:550
+#: build/trans_presets.java:565
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -21369,5 +21811,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:551
+#: build/trans_presets.java:566
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -21376,5 +21818,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:552
+#: build/trans_presets.java:567
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -21383,5 +21825,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:553
+#: build/trans_presets.java:568
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -21391,5 +21833,5 @@
 #. item "Ways/Path" combo "Visibility"
 #. visibilty
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
 msgid "Visibility"
@@ -21397,10 +21839,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "excellent"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "good"
 msgstr ""
@@ -21408,15 +21850,15 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:556 build/trans_presets.java:2736
+#: build/trans_presets.java:571 build/trans_presets.java:2881
 msgid "intermediate"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "bad"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "horrible"
 msgstr ""
@@ -21439,23 +21881,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:566 build/trans_presets.java:1809
-#: build/trans_presets.java:1827 build/trans_presets.java:1843
-#: build/trans_presets.java:1860 build/trans_presets.java:1878
-#: build/trans_presets.java:1895 build/trans_presets.java:1912
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2012 build/trans_presets.java:2031
-#: build/trans_presets.java:2047 build/trans_presets.java:2064
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:581 build/trans_presets.java:1943
+#: build/trans_presets.java:1961 build/trans_presets.java:1977
+#: build/trans_presets.java:1994 build/trans_presets.java:2012
+#: build/trans_presets.java:2029 build/trans_presets.java:2046
+#: build/trans_presets.java:2068 build/trans_presets.java:2091
+#: build/trans_presets.java:2110 build/trans_presets.java:2127
+#: build/trans_presets.java:2146 build/trans_presets.java:2165
+#: build/trans_presets.java:2181 build/trans_presets.java:2198
+#: build/trans_presets.java:2213
 msgid "Wheelchairs"
 msgstr "Ratastoolid"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:567
+#: build/trans_presets.java:582
 msgid "Ski"
 msgstr ""
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:568
+#: build/trans_presets.java:583
 msgid "Snowmobile"
 msgstr ""
@@ -21464,5 +21906,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:576
+#: build/trans_presets.java:592
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21470,5 +21912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:578
+#: build/trans_presets.java:594
 msgid "Edit Bridleway"
 msgstr "Lisa andmeid"
@@ -21476,5 +21918,5 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:595
+#: build/trans_presets.java:612
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21492,11 +21934,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:643
+#: build/trans_presets.java:616 build/trans_presets.java:638
+#: build/trans_presets.java:662
 msgid "Edit Cycleway"
 msgstr "Lisa andmeid"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:611
+#: build/trans_presets.java:628
 msgid "Pedestrians"
 msgstr ""
@@ -21504,5 +21946,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:616
+#: build/trans_presets.java:634
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21510,5 +21952,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:658
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21516,5 +21958,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:663
+#: build/trans_presets.java:683
 msgid "Dedicated Footway"
 msgstr ""
@@ -21523,5 +21965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:666
+#: build/trans_presets.java:686
 msgid "Edit Footway"
 msgstr "Lisa andmeid"
@@ -21529,5 +21971,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:682
+#: build/trans_presets.java:703
 msgid "Steps"
 msgstr ""
@@ -21537,10 +21979,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:707
 msgid "Edit Flight of Steps"
 msgstr "Lisa andmeid"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:700
+#: build/trans_presets.java:721
 msgid "Amount of Steps"
 msgstr ""
@@ -21548,5 +21990,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:725
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -21554,5 +21996,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:705
+#: build/trans_presets.java:726
 msgid "Motorway Junction"
 msgstr ""
@@ -21560,10 +22002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:728
 msgid "Edit Motorway Junction"
 msgstr "Lisa andmeid"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:711
+#: build/trans_presets.java:732
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -21572,10 +22014,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:712
+#: build/trans_presets.java:733
 msgid "Exit to"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:714
+#: build/trans_presets.java:735
 msgid "Services"
 msgstr ""
@@ -21583,5 +22025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:716
+#: build/trans_presets.java:737
 msgid "Edit Service Station"
 msgstr "Lisa andmeid"
@@ -21615,4 +22057,5 @@
 #. item "Public Building/Post Office" text "Operator"
 #. item "Education/Driving School" text "Operator"
+#. item "Health/Nursing Home" text "Operator"
 #. item "Health/Hearing Aids" text "Operator"
 #. <key key="amenity" value="baby_hatch" />
@@ -21671,42 +22114,44 @@
 #. item "Land use/Garages" text "Operator"
 #. item "Relations/Route" text "Operator"
+#. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:721 build/trans_presets.java:888
-#: build/trans_presets.java:1466 build/trans_presets.java:1490
-#: build/trans_presets.java:1499 build/trans_presets.java:1508
-#: build/trans_presets.java:1515 build/trans_presets.java:1523
-#: build/trans_presets.java:1539 build/trans_presets.java:1548
-#: build/trans_presets.java:1567 build/trans_presets.java:1706
-#: build/trans_presets.java:1803 build/trans_presets.java:1821
-#: build/trans_presets.java:1872 build/trans_presets.java:1889
-#: build/trans_presets.java:1948 build/trans_presets.java:1969
-#: build/trans_presets.java:2005 build/trans_presets.java:2024
-#: build/trans_presets.java:2155 build/trans_presets.java:2165
-#: build/trans_presets.java:2226 build/trans_presets.java:2311
-#: build/trans_presets.java:2336 build/trans_presets.java:2379
-#: build/trans_presets.java:2412 build/trans_presets.java:2444
-#: build/trans_presets.java:2457 build/trans_presets.java:2468
-#: build/trans_presets.java:2487 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2586
-#: build/trans_presets.java:2808 build/trans_presets.java:2817
-#: build/trans_presets.java:2939 build/trans_presets.java:2958
-#: build/trans_presets.java:2977 build/trans_presets.java:2995
-#: build/trans_presets.java:3006 build/trans_presets.java:3022
-#: build/trans_presets.java:3078 build/trans_presets.java:3114
-#: build/trans_presets.java:3122 build/trans_presets.java:3130
-#: build/trans_presets.java:3155 build/trans_presets.java:3270
-#: build/trans_presets.java:3279 build/trans_presets.java:3296
-#: build/trans_presets.java:3305 build/trans_presets.java:3342
-#: build/trans_presets.java:3391 build/trans_presets.java:3414
-#: build/trans_presets.java:3423 build/trans_presets.java:3445
-#: build/trans_presets.java:3460 build/trans_presets.java:3470
-#: build/trans_presets.java:3479 build/trans_presets.java:3507
-#: build/trans_presets.java:3516 build/trans_presets.java:3555
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3589 build/trans_presets.java:3605
-#: build/trans_presets.java:3627 build/trans_presets.java:3642
-#: build/trans_presets.java:3651 build/trans_presets.java:3919
-#: build/trans_presets.java:4012 build/trans_presets.java:4156
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:742 build/trans_presets.java:915
+#: build/trans_presets.java:1600 build/trans_presets.java:1624
+#: build/trans_presets.java:1633 build/trans_presets.java:1642
+#: build/trans_presets.java:1649 build/trans_presets.java:1657
+#: build/trans_presets.java:1673 build/trans_presets.java:1682
+#: build/trans_presets.java:1701 build/trans_presets.java:1840
+#: build/trans_presets.java:1937 build/trans_presets.java:1955
+#: build/trans_presets.java:2006 build/trans_presets.java:2023
+#: build/trans_presets.java:2082 build/trans_presets.java:2103
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2289 build/trans_presets.java:2299
+#: build/trans_presets.java:2360 build/trans_presets.java:2446
+#: build/trans_presets.java:2471 build/trans_presets.java:2514
+#: build/trans_presets.java:2547 build/trans_presets.java:2575
+#: build/trans_presets.java:2592 build/trans_presets.java:2600
+#: build/trans_presets.java:2612 build/trans_presets.java:2632
+#: build/trans_presets.java:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2731 build/trans_presets.java:2953
+#: build/trans_presets.java:2962 build/trans_presets.java:3084
+#: build/trans_presets.java:3103 build/trans_presets.java:3122
+#: build/trans_presets.java:3140 build/trans_presets.java:3151
+#: build/trans_presets.java:3167 build/trans_presets.java:3223
+#: build/trans_presets.java:3270 build/trans_presets.java:3278
+#: build/trans_presets.java:3286 build/trans_presets.java:3311
+#: build/trans_presets.java:3426 build/trans_presets.java:3435
+#: build/trans_presets.java:3452 build/trans_presets.java:3461
+#: build/trans_presets.java:3498 build/trans_presets.java:3547
+#: build/trans_presets.java:3570 build/trans_presets.java:3579
+#: build/trans_presets.java:3601 build/trans_presets.java:3616
+#: build/trans_presets.java:3626 build/trans_presets.java:3635
+#: build/trans_presets.java:3663 build/trans_presets.java:3672
+#: build/trans_presets.java:3711 build/trans_presets.java:3727
+#: build/trans_presets.java:3736 build/trans_presets.java:3745
+#: build/trans_presets.java:3761 build/trans_presets.java:3783
+#: build/trans_presets.java:3798 build/trans_presets.java:3807
+#: build/trans_presets.java:4082 build/trans_presets.java:4175
+#: build/trans_presets.java:4324 build/trans_presets.java:4354
+#: build/trans_presets.java:4376
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -21715,6 +22160,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:722 build/trans_presets.java:732
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:2628
 msgid "Toilets"
 msgstr "Tualetid"
@@ -21722,5 +22167,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:746
 msgid "Rest Area"
 msgstr ""
@@ -21728,5 +22173,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:727
+#: build/trans_presets.java:748
 msgid "Edit Rest Area"
 msgstr "Lisa andmeid"
@@ -21734,5 +22179,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:756
 msgid "Emergency Phone"
 msgstr ""
@@ -21742,5 +22187,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:761
 msgid "Traffic Signal"
 msgstr ""
@@ -21750,5 +22195,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:765
 msgid "Pedestrian crossing type"
 msgstr "Ülekäiguraja tüüp"
@@ -21757,6 +22202,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "uncontrolled"
 msgstr ""
@@ -21765,6 +22210,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "traffic_signals"
 msgstr ""
@@ -21773,6 +22218,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "island"
 msgstr ""
@@ -21781,6 +22226,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "unmarked"
 msgstr ""
@@ -21789,6 +22234,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:745 build/trans_presets.java:768
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:766 build/trans_presets.java:789
+#: build/trans_presets.java:1413
 msgid "Cross on horseback"
 msgstr ""
@@ -21797,6 +22242,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:746 build/trans_presets.java:767
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:767 build/trans_presets.java:788
+#: build/trans_presets.java:1414
 msgid "Cross by bicycle"
 msgstr ""
@@ -21805,11 +22250,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:747 build/trans_presets.java:769
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:768 build/trans_presets.java:790
+#: build/trans_presets.java:1415
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:769
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21817,5 +22262,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "zebra"
 msgstr ""
@@ -21823,5 +22268,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "pelican"
 msgstr ""
@@ -21829,5 +22274,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "toucan"
 msgstr ""
@@ -21835,5 +22280,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "puffin"
 msgstr ""
@@ -21841,5 +22286,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "pegasus"
 msgstr ""
@@ -21847,5 +22292,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "tiger"
 msgstr ""
@@ -21853,5 +22298,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:772
 msgid "Stop"
 msgstr ""
@@ -21859,5 +22304,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:754
+#: build/trans_presets.java:775
 msgid "Mini-roundabout"
 msgstr "Miniring"
@@ -21868,15 +22313,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:759
+#: build/trans_presets.java:780
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:759
+#: build/trans_presets.java:780
 msgid "clockwise"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:782
 msgid "Pedestrian Crossing"
 msgstr "Ülekäigurada"
@@ -21885,15 +22330,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:764
+#: build/trans_presets.java:785
 msgid "Edit Crossing"
 msgstr "Lisa andmeid"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:791
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:793
 msgid "Traffic Calming"
 msgstr "Liikluse rahustamine"
@@ -21901,40 +22346,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:774
+#: build/trans_presets.java:795
 msgid "Edit Traffic Calming"
 msgstr "Lisa andmeid"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:798
 msgid "Passing Place"
 msgstr ""
@@ -21942,5 +22387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:800
 msgid "Edit Passing Place"
 msgstr "Lisa andmeid"
@@ -21948,5 +22393,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:803
 msgid "Turning Circle"
 msgstr ""
@@ -21956,5 +22401,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:808
 msgid "City Limit"
 msgstr "Linnapiiri märk"
@@ -21962,15 +22407,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:789
+#: build/trans_presets.java:810
 msgid "Edit City Limit Sign"
 msgstr "Lisa andmeid"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:815
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:796
+#: build/trans_presets.java:817
 msgid "Speed Camera"
 msgstr "Kiiruskaamera"
@@ -21979,18 +22424,6 @@
 #. <key key="highway" value="speed_camera" />
 #. <separator/>
-#. item "Waypoints/Incline"
-#: build/trans_presets.java:801
-msgid "Incline"
-msgstr ""
-
-#. <key key="highway" value="incline" />
-#. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:804
-msgid "Incline Steep"
-msgstr ""
-
-#. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:822
 msgid "Grit Bin"
 msgstr ""
@@ -22000,10 +22433,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:827
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:813
+#: build/trans_presets.java:828
 msgid "Edit Ford"
 msgstr "Lisa andmeid"
@@ -22011,5 +22444,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:820
+#: build/trans_presets.java:835
 msgid "Mountain Pass"
 msgstr ""
@@ -22017,5 +22450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:837
 msgid "Edit Mountain Pass"
 msgstr "Lisa andmeid"
@@ -22027,7 +22460,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:827 build/trans_presets.java:1890
-#: build/trans_presets.java:2139 build/trans_presets.java:3785
-#: build/trans_presets.java:3793 build/trans_presets.java:3801
+#: build/trans_presets.java:842 build/trans_presets.java:2024
+#: build/trans_presets.java:2273 build/trans_presets.java:3948
+#: build/trans_presets.java:3956 build/trans_presets.java:3964
 msgid "Elevation"
 msgstr ""
@@ -22052,4 +22485,5 @@
 #. item "Places/Village" text "Wikipedia"
 #. item "Places/Hamlet" text "Wikipedia"
+#. item "Places/Isolated Dwelling" text "Wikipedia"
 #. item "Places/Locality" text "Wikipedia"
 #. item "Geography/Peak" text "Wikipedia"
@@ -22061,18 +22495,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:828 build/trans_presets.java:1066
-#: build/trans_presets.java:1077 build/trans_presets.java:1091
-#: build/trans_presets.java:1106 build/trans_presets.java:1732
-#: build/trans_presets.java:2194 build/trans_presets.java:2265
-#: build/trans_presets.java:3170 build/trans_presets.java:3701
-#: build/trans_presets.java:3708 build/trans_presets.java:3715
-#: build/trans_presets.java:3722 build/trans_presets.java:3729
-#: build/trans_presets.java:3737 build/trans_presets.java:3745
-#: build/trans_presets.java:3753 build/trans_presets.java:3760
-#: build/trans_presets.java:3767 build/trans_presets.java:3776
-#: build/trans_presets.java:3786 build/trans_presets.java:3794
-#: build/trans_presets.java:3802 build/trans_presets.java:3809
-#: build/trans_presets.java:3818 build/trans_presets.java:3826
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:843 build/trans_presets.java:1099
+#: build/trans_presets.java:1110 build/trans_presets.java:1124
+#: build/trans_presets.java:1139 build/trans_presets.java:1866
+#: build/trans_presets.java:2328 build/trans_presets.java:2399
+#: build/trans_presets.java:3326 build/trans_presets.java:3857
+#: build/trans_presets.java:3864 build/trans_presets.java:3871
+#: build/trans_presets.java:3878 build/trans_presets.java:3885
+#: build/trans_presets.java:3893 build/trans_presets.java:3901
+#: build/trans_presets.java:3909 build/trans_presets.java:3916
+#: build/trans_presets.java:3923 build/trans_presets.java:3930
+#: build/trans_presets.java:3939 build/trans_presets.java:3949
+#: build/trans_presets.java:3957 build/trans_presets.java:3965
+#: build/trans_presets.java:3972 build/trans_presets.java:3981
+#: build/trans_presets.java:3989 build/trans_presets.java:4254
 msgid "Wikipedia"
 msgstr "Vikipeedia"
@@ -22080,5 +22514,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:832
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Tõkked"
@@ -22086,5 +22520,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Pollar"
@@ -22092,5 +22526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Lisa andmeid"
@@ -22099,4 +22533,9 @@
 #. <key key="barrier" value="bollard" />
 #. item "Barriers/Bollard" label "Allowed traffic:"
+#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#. item "Barriers/Cycle Barrier" label "Allowed traffic:"
+#. <key key="barrier" value="block" />
+#. item "Barriers/Block" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="cattle_grid" />
@@ -22135,29 +22574,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:840 build/trans_presets.java:859
-#: build/trans_presets.java:873 build/trans_presets.java:895
-#: build/trans_presets.java:932 build/trans_presets.java:945
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1003 build/trans_presets.java:1012
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:855 build/trans_presets.java:865
+#: build/trans_presets.java:874 build/trans_presets.java:886
+#: build/trans_presets.java:900 build/trans_presets.java:922
+#: build/trans_presets.java:965 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1014 build/trans_presets.java:1026
+#: build/trans_presets.java:1036 build/trans_presets.java:1045
+#: build/trans_presets.java:1054
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
 
-#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:851
+#: build/trans_presets.java:872
 msgid "Block"
 msgstr ""
 
-#. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:881
 msgid "Cattle Grid"
 msgstr ""
@@ -22165,10 +22602,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:856
+#: build/trans_presets.java:883
 msgid "Edit Cattle Grid"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:866
+#: build/trans_presets.java:893
 msgid "Bus Trap"
 msgstr ""
@@ -22176,15 +22613,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:869
+#: build/trans_presets.java:896
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:870
+#: build/trans_presets.java:897
 msgid "Edit Spikes"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:908
 msgid "Toll Booth"
 msgstr "Toll"
@@ -22192,5 +22629,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:910
 msgid "Edit Toll Booth"
 msgstr "Lisa andmeid"
@@ -22198,10 +22635,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:891
+#: build/trans_presets.java:918
 msgid "Border Control"
 msgstr "Piirikontroll"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:919
 msgid "Edit Border Control"
 msgstr "Lisa andmeid"
@@ -22210,5 +22647,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:906
+#: build/trans_presets.java:933
 msgid "Hedge"
 msgstr ""
@@ -22217,28 +22654,25 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
+#: build/trans_presets.java:937
+msgid "Fence"
+msgstr ""
+
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:910 build/trans_presets.java:912
-msgid "Fence"
-msgstr ""
-
-#. item "Barriers/Fence" combo "Fence" display value
-#. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:912 build/trans_presets.java:2203
-msgid "fence"
-msgstr ""
-
-#. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:912
-msgid "wood_fence"
-msgstr ""
-
-#. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:912
-msgid "wire_fence"
-msgstr ""
-
+#. <key key="barrier" value="fence" />
+#. item "Barriers/Wire Fence"
+#: build/trans_presets.java:941
+msgid "Wire Fence"
+msgstr ""
+
+#. <key key="barrier" value="wire_fence" />
+#. item "Barriers/Wood Fence"
+#: build/trans_presets.java:944
+#, fuzzy
+msgid "Wood Fence"
+msgstr "Välimus ja tunnetus"
+
+#. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:914
+#: build/trans_presets.java:947
 msgid "Wall"
 msgstr ""
@@ -22246,5 +22680,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:950
 msgid "City Wall"
 msgstr ""
@@ -22253,5 +22687,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:954
 msgid "Retaining Wall"
 msgstr ""
@@ -22262,15 +22696,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:961
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:962
 msgid "Edit Entrance"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:940
+#: build/trans_presets.java:973
 msgid "Gate"
 msgstr "Värav"
@@ -22278,50 +22712,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:942
+#: build/trans_presets.java:975
 msgid "Edit Gate"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:953
+#: build/trans_presets.java:986
 msgid "Lift Gate"
 msgstr "Tõkkepuu"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:987
 msgid "Edit Lift Gate"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:965
+#: build/trans_presets.java:998
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:999
 msgid "Edit Hampshire Gate"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:977
+#: build/trans_presets.java:1010
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:978
+#: build/trans_presets.java:1011
 msgid "Edit Bump Gate"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1022
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:990
+#: build/trans_presets.java:1023
 msgid "Edit Kissing Gate"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1031
 msgid "Stile"
 msgstr ""
@@ -22329,25 +22763,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:1033
 msgid "Edit Stile"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1008
+#: build/trans_presets.java:1041
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1042
 msgid "Edit Turnstile"
 msgstr "Lisa andmeid"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1017
+#: build/trans_presets.java:1050
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1051
 msgid "Edit Sally Port"
 msgstr "Lisa andmeid"
@@ -22357,6 +22791,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1032 build/trans_presets.java:1033
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1065 build/trans_presets.java:1066
+#: build/trans_presets.java:1167
 msgid "Water"
 msgstr "Vesi"
@@ -22364,5 +22798,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1068
 msgid "Drain"
 msgstr "Äravoolutoru"
@@ -22370,10 +22804,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1037
+#: build/trans_presets.java:1070
 msgid "Edit Drain"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1076
 msgid "Ditch"
 msgstr "Kraav"
@@ -22381,10 +22815,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1045
+#: build/trans_presets.java:1078
 msgid "Edit Ditch"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1084
 msgid "Stream"
 msgstr "Oja"
@@ -22392,10 +22826,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1086
 msgid "Edit Stream"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1092
 msgid "Canal"
 msgstr "Kanal"
@@ -22403,10 +22837,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1094
 msgid "Edit Canal"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1101
 msgid "River"
 msgstr "Jõgi"
@@ -22416,5 +22850,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1105
 msgid "Edit River"
 msgstr "Lisa andmeid"
@@ -22422,5 +22856,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1113
 msgid "Spring"
 msgstr "Allikas"
@@ -22428,20 +22862,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1115
 msgid "Edit Spring"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1119
 msgid "Waterfall"
 msgstr "Kosk"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1120
 msgid "Edit Waterfall"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1126
 msgid "Weir"
 msgstr "Pais"
@@ -22449,10 +22883,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1128
 msgid "Edit Weir"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1133
 msgid "Dam"
 msgstr "Tamm"
@@ -22460,10 +22894,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1135
 msgid "Edit Dam"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1141
 msgid "Groyne"
 msgstr ""
@@ -22471,5 +22905,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1143
 msgid "Edit Groyne"
 msgstr "Lisa andmeid"
@@ -22479,15 +22913,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1148
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1149
 msgid "Edit Basin Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1154
 msgid "Reservoir"
 msgstr ""
@@ -22495,15 +22929,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1156
 msgid "Edit Reservoir Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1161
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1162
 msgid "Edit Covered Reservoir"
 msgstr "Lisa andmeid"
@@ -22511,20 +22945,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1169
 msgid "Edit Water"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1173
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1174
 msgid "Edit Land"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1178
 msgid "Coastline"
 msgstr "Rannik"
@@ -22532,10 +22966,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1180
 msgid "Edit Coastline"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1151
+#: build/trans_presets.java:1184
 msgid "Riverbank"
 msgstr "Jõekallas"
@@ -22544,5 +22978,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1187
 msgid "Edit Riverbank"
 msgstr "Lisa andmeid"
@@ -22550,5 +22984,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1192
 msgid "Wetland"
 msgstr ""
@@ -22559,15 +22993,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1197
 msgid "Edit Wetland"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "swamp"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "bog"
 msgstr "raba"
@@ -22580,40 +23014,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1167 build/trans_style.java:2930
+#: build/trans_presets.java:1200 build/trans_style.java:2930
 msgid "marsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "reedbed"
 msgstr "roostik"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "saltmarsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "tidalflat"
 msgstr "padumeri"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "mangrove"
 msgstr "mangroov"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1202
 msgid "Mud"
 msgstr "Muda"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1203
 msgid "Edit Mud"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1207
 msgid "Beach"
 msgstr "Rand"
@@ -22621,20 +23055,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1209
 msgid "Edit Beach"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1213
 msgid "Bay"
 msgstr "Laht"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1214
 msgid "Edit Bay"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1218
 msgid "Cliff"
 msgstr ""
@@ -22642,15 +23076,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1220
 msgid "Edit Cliff"
 msgstr "Lisa andmeid"
 
 #. group "Shipping"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1225
 msgid "Shipping"
 msgstr "Laevandus"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1226
 msgid "Ferry Terminal"
 msgstr "Sadamaterminal"
@@ -22658,20 +23092,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1228
 msgid "Edit Ferry Terminal"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "vehicle"
 msgstr ""
@@ -22679,4 +23113,5 @@
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. </rule>
@@ -22756,26 +23191,26 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1198 build/trans_presets.java:4149
-#: build/trans_style.java:189 build/trans_style.java:525
-#: build/trans_style.java:545 build/trans_style.java:551
-#: build/trans_style.java:570 build/trans_style.java:577
-#: build/trans_style.java:753 build/trans_style.java:759
-#: build/trans_style.java:765 build/trans_style.java:771
-#: build/trans_style.java:777
+#: build/trans_presets.java:1231 build/trans_presets.java:4317
+#: build/trans_presets.java:4347 build/trans_style.java:189
+#: build/trans_style.java:525 build/trans_style.java:545
+#: build/trans_style.java:551 build/trans_style.java:570
+#: build/trans_style.java:577 build/trans_style.java:753
+#: build/trans_style.java:759 build/trans_style.java:765
+#: build/trans_style.java:771 build/trans_style.java:777
 msgid "bicycle"
 msgstr "jalgrattaga"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1233
 msgid "Ferry Route"
 msgstr ""
@@ -22783,5 +23218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1235
 msgid "Edit Ferry"
 msgstr "Lisa andmeid"
@@ -22790,15 +23225,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1243
 msgid "Marina"
 msgstr "Jahisadam"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1244
 msgid "Edit Marina"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1248
 msgid "Pier"
 msgstr "Kai"
@@ -22806,10 +23241,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1250
 msgid "Edit Pier"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1254
 msgid "Lock Gate"
 msgstr ""
@@ -22818,5 +23253,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1258
 msgid "Turning Point"
 msgstr ""
@@ -22826,5 +23261,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1263
 msgid "Slipway"
 msgstr ""
@@ -22834,10 +23269,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1267
 msgid "Edit Slipway"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1271
 msgid "Boatyard"
 msgstr ""
@@ -22845,10 +23280,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1273
 msgid "Edit Boatyard"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1278
 msgid "Dock"
 msgstr ""
@@ -22856,20 +23291,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1280
 msgid "Edit Dock"
 msgstr "Lisa andmeid"
 
 #. group "Transport"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1287
 msgid "Transport"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1288
 msgid "Railway"
 msgstr "Raudtee"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1289
 msgid "Rail"
 msgstr ""
@@ -22877,5 +23312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1291
 msgid "Edit Rail"
 msgstr "Lisa andmeid"
@@ -22905,7 +23340,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1262 build/trans_presets.java:1274
-#: build/trans_presets.java:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
+#: build/trans_presets.java:1295 build/trans_presets.java:1307
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
 msgid "Gauge (mm)"
 msgstr ""
@@ -22921,8 +23356,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1296 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368
 msgid "Types"
 msgstr ""
@@ -22936,8 +23371,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368 build/trans_presets.java:1398
 msgid "yard"
 msgstr ""
@@ -22951,8 +23386,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368 build/trans_presets.java:1398
 msgid "siding"
 msgstr ""
@@ -22966,8 +23401,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368 build/trans_presets.java:1398
 msgid "spur"
 msgstr ""
@@ -22980,8 +23415,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1297 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369
 msgid "Electrified"
 msgstr ""
@@ -22994,8 +23429,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1297 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369
 msgid "contact_line"
 msgstr ""
@@ -23056,8 +23491,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336 build/trans_style.java:595
+#: build/trans_presets.java:1297 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -23079,9 +23514,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1265 build/trans_presets.java:1277
-#: build/trans_presets.java:1289 build/trans_presets.java:1301
-#: build/trans_presets.java:1313 build/trans_presets.java:1325
-#: build/trans_presets.java:1337 build/trans_presets.java:1491
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:1298 build/trans_presets.java:1310
+#: build/trans_presets.java:1322 build/trans_presets.java:1334
+#: build/trans_presets.java:1346 build/trans_presets.java:1358
+#: build/trans_presets.java:1370 build/trans_presets.java:1625
+#: build/trans_presets.java:3314
 msgid "Voltage"
 msgstr "Pinge"
@@ -23094,8 +23529,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1266 build/trans_presets.java:1278
-#: build/trans_presets.java:1290 build/trans_presets.java:1302
-#: build/trans_presets.java:1314 build/trans_presets.java:1326
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323 build/trans_presets.java:1335
+#: build/trans_presets.java:1347 build/trans_presets.java:1359
+#: build/trans_presets.java:1371
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23108,8 +23543,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1266 build/trans_presets.java:1278
-#: build/trans_presets.java:1290 build/trans_presets.java:1302
-#: build/trans_presets.java:1314 build/trans_presets.java:1326
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1299 build/trans_presets.java:1311
+#: build/trans_presets.java:1323 build/trans_presets.java:1335
+#: build/trans_presets.java:1347 build/trans_presets.java:1359
+#: build/trans_presets.java:1371
 msgid "16.7"
 msgstr ""
@@ -23117,10 +23552,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1302
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1303
 msgid "Edit Narrow Gauge Rail"
 msgstr "Lisa andmeid"
@@ -23128,5 +23563,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1314
 msgid "Monorail"
 msgstr ""
@@ -23134,5 +23569,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1316
 msgid "Edit Monorail"
 msgstr "Lisa andmeid"
@@ -23140,10 +23575,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1326
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1327
 msgid "Edit Preserved Railway"
 msgstr "Lisa andmeid"
@@ -23151,10 +23586,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:1338
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1339
 msgid "Edit Light Rail"
 msgstr "Lisa andmeid"
@@ -23162,10 +23597,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1350
 msgid "Subway"
 msgstr "Metroo"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1351
 msgid "Edit Subway"
 msgstr "Lisa andmeid"
@@ -23173,10 +23608,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1329
+#: build/trans_presets.java:1362
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1363
 msgid "Edit Tram"
 msgstr "Lisa andmeid"
@@ -23184,5 +23619,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1374
 msgid "Bus Guideway"
 msgstr ""
@@ -23190,5 +23625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1376
 msgid "Edit Bus Guideway"
 msgstr "Lisa andmeid"
@@ -23197,10 +23632,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1394
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1395
 msgid "Edit Disused Railway"
 msgstr "Lisa andmeid"
@@ -23209,10 +23644,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1398
 msgid "Optional Types"
 msgstr ""
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1400
 msgid "Abandoned Rail"
 msgstr ""
@@ -23221,5 +23656,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1404
 msgid "Level Crossing"
 msgstr ""
@@ -23228,5 +23663,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1408
 msgid "Crossing"
 msgstr ""
@@ -23236,5 +23671,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1412
 msgid "Crossing type"
 msgstr ""
@@ -23242,5 +23677,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1418
 msgid "Turntable"
 msgstr ""
@@ -23249,5 +23684,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1422
 msgid "Buffer Stop"
 msgstr ""
@@ -23256,10 +23691,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1427
 msgid "Aerialway"
 msgstr "Köisraudteed"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1428
 msgid "Chair Lift"
 msgstr ""
@@ -23267,10 +23702,110 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1430
 msgid "Edit Chair Lift"
 msgstr "Lisa andmeid"
 
+#. item "Aerialway/Chair Lift" text "Reference number"
+#. item "Aerialway/Drag Lift" text "Reference number"
+#. item "Aerialway/Cable Car" text "Reference number"
+#. item "Aerialway/Gondola" text "Reference number"
+#. item "Aerialway/Mixed Lift" text "Reference number"
+#. item "Aerialway/T-bar Lift" text "Reference number"
+#. item "Aerialway/J-bar Lift" text "Reference number"
+#. item "Aerialway/Platter Lift" text "Reference number"
+#. item "Aerialway/Rope Tow" text "Reference number"
+#. item "Aerialway/Magic Carpet" text "Reference number"
+#. item "Aerialway/Goods" text "Reference number"
+#. item "Car/Parking" text "Reference number"
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Facilities/Toilets" text "Reference number"
+#. item "Vending machine" text "Reference number"
+#: build/trans_presets.java:1433 build/trans_presets.java:1447
+#: build/trans_presets.java:1458 build/trans_presets.java:1471
+#: build/trans_presets.java:1484 build/trans_presets.java:1498
+#: build/trans_presets.java:1509 build/trans_presets.java:1520
+#: build/trans_presets.java:1531 build/trans_presets.java:1542
+#: build/trans_presets.java:1552 build/trans_presets.java:1579
+#: build/trans_presets.java:2290 build/trans_presets.java:2300
+#: build/trans_presets.java:2633 build/trans_presets.java:3808
+msgid "Reference number"
+msgstr "Viitenumber"
+
+#. <optional>
+#. item "Aerialway/Chair Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Drag Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Cable Car" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Gondola" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Mixed Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/T-bar Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/J-bar Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Platter Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Rope Tow" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Magic Carpet" text "Number of people per hour"
+#: build/trans_presets.java:1435 build/trans_presets.java:1449
+#: build/trans_presets.java:1460 build/trans_presets.java:1473
+#: build/trans_presets.java:1486 build/trans_presets.java:1500
+#: build/trans_presets.java:1511 build/trans_presets.java:1522
+#: build/trans_presets.java:1533 build/trans_presets.java:1544
+#, fuzzy
+msgid "Number of people per hour"
+msgstr "Kohtade arv"
+
+#. item "Aerialway/Chair Lift" text "Number of people per chair"
+#: build/trans_presets.java:1436
+#, fuzzy
+msgid "Number of people per chair"
+msgstr "Kohtade arv"
+
+#. item "Aerialway/Chair Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Drag Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Cable Car" text "Typical journey time in minutes"
+#. item "Aerialway/Gondola" text "Typical journey time in minutes"
+#. item "Aerialway/Mixed Lift" text "Typical journey time in minutes"
+#. item "Aerialway/T-bar Lift" text "Typical journey time in minutes"
+#. item "Aerialway/J-bar Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Platter Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Rope Tow" text "Typical journey time in minutes"
+#. item "Aerialway/Magic Carpet" text "Typical journey time in minutes"
+#. <optional>
+#. item "Aerialway/Goods" text "Typical journey time in minutes"
+#: build/trans_presets.java:1437 build/trans_presets.java:1450
+#: build/trans_presets.java:1462 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1501
+#: build/trans_presets.java:1512 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1545
+#: build/trans_presets.java:1554
+msgid "Typical journey time in minutes"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" check "Has bubble?"
+#. item "Aerialway/Mixed Lift" check "Has bubble?"
+#: build/trans_presets.java:1438 build/trans_presets.java:1489
+msgid "Has bubble?"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" check "Has heating?"
+#. item "Aerialway/Cable Car" check "Has heating?"
+#. item "Aerialway/Gondola" check "Has heating?"
+#. item "Aerialway/Mixed Lift" check "Has heating?"
+#: build/trans_presets.java:1439 build/trans_presets.java:1463
+#: build/trans_presets.java:1476 build/trans_presets.java:1490
+#, fuzzy
+msgid "Has heating?"
+msgstr "uisutamine"
+
+#. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Drag Lift"
 msgstr ""
@@ -23278,10 +23813,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1444
 msgid "Edit Drag Lift"
 msgstr "Lisa andmeid"
 
+#. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1453
 msgid "Cable Car"
 msgstr ""
@@ -23289,10 +23825,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1455
 msgid "Edit Cable Car"
 msgstr "Lisa andmeid"
 
+#. item "Aerialway/Cable Car" text "Number of people per car"
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Number of people per car"
+msgstr "Kohtade arv"
+
+#. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1466
 msgid "Gondola"
 msgstr ""
@@ -23300,11 +23843,113 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1468
 msgid "Edit Gondola"
 msgstr "Lisa andmeid"
 
+#. item "Aerialway/Gondola" text "Number of people per gondola"
+#: build/trans_presets.java:1474
+msgid "Number of people per gondola"
+msgstr ""
+
+#. </optional>
+#. item "Aerialway/Mixed Lift"
+#: build/trans_presets.java:1479
+msgid "Mixed Lift"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
+#: build/trans_presets.java:1481
+msgid "Edit Mixed Lift (containing both gondolas and chairs)"
+msgstr ""
+
+#. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
+#: build/trans_presets.java:1487
+msgid "Number of people per gondola/chair"
+msgstr ""
+
+#. </optional>
+#. item "Aerialway/T-bar Lift"
+#: build/trans_presets.java:1493
+msgid "T-bar Lift"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
+#: build/trans_presets.java:1495
+#, fuzzy
+msgid "Edit T-bar Lift"
+msgstr "Lisa andmeid"
+
+#. </optional>
+#. item "Aerialway/J-bar Lift"
+#: build/trans_presets.java:1504
+msgid "J-bar Lift"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
+#: build/trans_presets.java:1506
+#, fuzzy
+msgid "Edit J-bar Lift"
+msgstr "Lisa andmeid"
+
+#. </optional>
+#. item "Aerialway/Platter Lift"
+#: build/trans_presets.java:1515
+msgid "Platter Lift"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Platter Lift" label "Edit Platter Lift"
+#: build/trans_presets.java:1517
+#, fuzzy
+msgid "Edit Platter Lift"
+msgstr "Lisa andmeid"
+
+#. </optional>
+#. item "Aerialway/Rope Tow"
+#: build/trans_presets.java:1526
+#, fuzzy
+msgid "Rope Tow"
+msgstr "Elektriliini mast"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Rope Tow" label "Edit Rope Tow"
+#: build/trans_presets.java:1528
+#, fuzzy
+msgid "Edit Rope Tow"
+msgstr "Lisa andmeid"
+
+#. </optional>
+#. item "Aerialway/Magic Carpet"
+#: build/trans_presets.java:1537
+msgid "Magic Carpet"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
+#: build/trans_presets.java:1539
+#, fuzzy
+msgid "Edit Magic Carpet"
+msgstr "Lisa andmeid"
+
+#. </optional>
+#. item "Aerialway/Goods"
+#: build/trans_presets.java:1548
+msgctxt "aerialway"
+msgid "Goods"
+msgstr ""
+
+#. item "Aerialway/Goods" label "Edit Goods"
+#: build/trans_presets.java:1549
+msgctxt "aerialway"
+msgid "Edit Goods"
+msgstr "Lisa andmeid"
+
+#. </optional>
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1558
 msgctxt "aerialway"
 msgid "Station"
@@ -23313,5 +23958,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1421
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23319,5 +23964,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1564
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23326,19 +23971,7 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1566
 msgctxt "aerialway"
 msgid "Edit Pylon"
-msgstr "Lisa andmeid"
-
-#. item "Aerialway/Goods"
-#: build/trans_presets.java:1431
-msgctxt "aerialway"
-msgid "Goods"
-msgstr ""
-
-#. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1432
-msgctxt "aerialway"
-msgid "Edit Goods"
 msgstr "Lisa andmeid"
 
@@ -23354,6 +23987,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1439 build/trans_presets.java:1553
-#: build/trans_presets.java:1585 build/trans_surveyor.java:24
+#: build/trans_presets.java:1573 build/trans_presets.java:1687
+#: build/trans_presets.java:1719 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
@@ -23362,22 +23995,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1576
 msgid "Edit Parking"
 msgstr "Lisa andmeid"
 
-#. item "Car/Parking" text "Reference number"
-#. item "Tourism/Information Terminal" text "Reference number"
-#. item "Tourism/Audioguide" text "Reference number"
-#. item "Facilities/Toilets" text "Reference number"
-#. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1445 build/trans_presets.java:2156
-#: build/trans_presets.java:2166 build/trans_presets.java:2488
-#: build/trans_presets.java:3652
-msgid "Reference number"
-msgstr "Viitenumber"
-
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "multi-storey"
 msgstr ""
@@ -23385,5 +24007,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "surface"
 msgstr ""
@@ -23391,10 +24013,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "underground"
 msgstr "maa-alune"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1581
 msgid "Park and Ride"
 msgstr ""
@@ -23405,7 +24027,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1448 build/trans_presets.java:1559
-#: build/trans_presets.java:2157 build/trans_presets.java:2167
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:1582 build/trans_presets.java:1693
+#: build/trans_presets.java:2291 build/trans_presets.java:2301
+#: build/trans_presets.java:2634
 msgid "Fee"
 msgstr ""
@@ -23413,25 +24035,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1584
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1585
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1452
+#: build/trans_presets.java:1586
 msgid "Spaces for Women"
 msgstr ""
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1587
 msgid "Spaces for Parents"
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1588
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -23439,5 +24061,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1591
 msgid "Fuel"
 msgstr ""
@@ -23447,5 +24069,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1595
 msgid "Edit Fuel"
 msgstr "Lisa andmeid"
@@ -23459,118 +24081,118 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1463 build/trans_presets.java:1498
-#: build/trans_presets.java:1514 build/trans_presets.java:1522
-#: build/trans_presets.java:1538 build/trans_presets.java:1547
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1597 build/trans_presets.java:1632
+#: build/trans_presets.java:1648 build/trans_presets.java:1656
+#: build/trans_presets.java:1672 build/trans_presets.java:1681
+#: build/trans_presets.java:1700
 msgid "Brand"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Total"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Independent"
 msgstr ""
@@ -23599,5 +24221,4 @@
 #. item "Culture/Museum" combo "Opening Hours"
 #. item "Culture/Library" combo "Opening Hours"
-#. item "Culture/Place of Worship" combo "Opening Hours"
 #. item "Public Building/Community Centre" combo "Opening Hours"
 #. item "Health/Doctors" combo "Opening Hours"
@@ -23664,48 +24285,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2092
-#: build/trans_presets.java:2107 build/trans_presets.java:2193
-#: build/trans_presets.java:2204 build/trans_presets.java:2211
-#: build/trans_presets.java:2227 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2337 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2445 build/trans_presets.java:2458
-#: build/trans_presets.java:2479 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:3176
-#: build/trans_presets.java:3184 build/trans_presets.java:3233
-#: build/trans_presets.java:3240 build/trans_presets.java:3247
-#: build/trans_presets.java:3255 build/trans_presets.java:3262
-#: build/trans_presets.java:3271 build/trans_presets.java:3280
-#: build/trans_presets.java:3287 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3312
-#: build/trans_presets.java:3320 build/trans_presets.java:3326
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3392 build/trans_presets.java:3400
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3446
-#: build/trans_presets.java:3454 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3499
-#: build/trans_presets.java:3508 build/trans_presets.java:3517
-#: build/trans_presets.java:3525 build/trans_presets.java:3532
-#: build/trans_presets.java:3540 build/trans_presets.java:3547
-#: build/trans_presets.java:3556 build/trans_presets.java:3563
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3597
-#: build/trans_presets.java:3606 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3628
-#: build/trans_presets.java:3634 build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2226
+#: build/trans_presets.java:2241 build/trans_presets.java:2327
+#: build/trans_presets.java:2338 build/trans_presets.java:2345
+#: build/trans_presets.java:2361 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2472
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2593
+#: build/trans_presets.java:2601 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3443
+#: build/trans_presets.java:3453 build/trans_presets.java:3462
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:3512 build/trans_presets.java:3518
+#: build/trans_presets.java:3526 build/trans_presets.java:3533
+#: build/trans_presets.java:3539 build/trans_presets.java:3548
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3571 build/trans_presets.java:3580
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3627 build/trans_presets.java:3636
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3712
+#: build/trans_presets.java:3719 build/trans_presets.java:3728
+#: build/trans_presets.java:3737 build/trans_presets.java:3746
+#: build/trans_presets.java:3753 build/trans_presets.java:3762
+#: build/trans_presets.java:3768 build/trans_presets.java:3775
+#: build/trans_presets.java:3784 build/trans_presets.java:3790
+#: build/trans_presets.java:3799
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -23732,5 +24353,5 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Public Building/Community Centre" combo "Opening Hours" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
@@ -23796,47 +24417,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2337 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2445 build/trans_presets.java:2479
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:3176 build/trans_presets.java:3184
-#: build/trans_presets.java:3233 build/trans_presets.java:3240
-#: build/trans_presets.java:3247 build/trans_presets.java:3255
-#: build/trans_presets.java:3262 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3287
-#: build/trans_presets.java:3297 build/trans_presets.java:3306
-#: build/trans_presets.java:3312 build/trans_presets.java:3320
-#: build/trans_presets.java:3326 build/trans_presets.java:3334
-#: build/trans_presets.java:3343 build/trans_presets.java:3349
-#: build/trans_presets.java:3356 build/trans_presets.java:3362
-#: build/trans_presets.java:3370 build/trans_presets.java:3377
-#: build/trans_presets.java:3383 build/trans_presets.java:3392
-#: build/trans_presets.java:3400 build/trans_presets.java:3406
-#: build/trans_presets.java:3415 build/trans_presets.java:3424
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3446 build/trans_presets.java:3454
-#: build/trans_presets.java:3471 build/trans_presets.java:3480
-#: build/trans_presets.java:3487 build/trans_presets.java:3493
-#: build/trans_presets.java:3499 build/trans_presets.java:3508
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3540
-#: build/trans_presets.java:3547 build/trans_presets.java:3556
-#: build/trans_presets.java:3563 build/trans_presets.java:3572
-#: build/trans_presets.java:3581 build/trans_presets.java:3590
-#: build/trans_presets.java:3597 build/trans_presets.java:3606
-#: build/trans_presets.java:3612 build/trans_presets.java:3619
-#: build/trans_presets.java:3628 build/trans_presets.java:3634
-#: build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2438
+#: build/trans_presets.java:2472 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2584
+#: build/trans_presets.java:2593 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3443
+#: build/trans_presets.java:3453 build/trans_presets.java:3462
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:3512 build/trans_presets.java:3518
+#: build/trans_presets.java:3526 build/trans_presets.java:3533
+#: build/trans_presets.java:3539 build/trans_presets.java:3548
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3571 build/trans_presets.java:3580
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3627 build/trans_presets.java:3636
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3712
+#: build/trans_presets.java:3719 build/trans_presets.java:3728
+#: build/trans_presets.java:3737 build/trans_presets.java:3746
+#: build/trans_presets.java:3753 build/trans_presets.java:3762
+#: build/trans_presets.java:3768 build/trans_presets.java:3775
+#: build/trans_presets.java:3784 build/trans_presets.java:3790
+#: build/trans_presets.java:3799
 msgid "24/7"
 msgstr ""
@@ -23864,5 +24485,5 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Public Building/Community Centre" combo "Opening Hours" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
@@ -23928,47 +24549,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2227
-#: build/trans_presets.java:2264 build/trans_presets.java:2280
-#: build/trans_presets.java:2303 build/trans_presets.java:2337
-#: build/trans_presets.java:2422 build/trans_presets.java:2428
-#: build/trans_presets.java:2436 build/trans_presets.java:2445
-#: build/trans_presets.java:2479 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:3176
-#: build/trans_presets.java:3184 build/trans_presets.java:3233
-#: build/trans_presets.java:3240 build/trans_presets.java:3247
-#: build/trans_presets.java:3255 build/trans_presets.java:3262
-#: build/trans_presets.java:3271 build/trans_presets.java:3280
-#: build/trans_presets.java:3287 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3312
-#: build/trans_presets.java:3320 build/trans_presets.java:3326
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3392 build/trans_presets.java:3400
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3446
-#: build/trans_presets.java:3454 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3499
-#: build/trans_presets.java:3508 build/trans_presets.java:3517
-#: build/trans_presets.java:3525 build/trans_presets.java:3532
-#: build/trans_presets.java:3540 build/trans_presets.java:3547
-#: build/trans_presets.java:3556 build/trans_presets.java:3563
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3597
-#: build/trans_presets.java:3606 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3628
-#: build/trans_presets.java:3634 build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2361
+#: build/trans_presets.java:2398 build/trans_presets.java:2414
+#: build/trans_presets.java:2438 build/trans_presets.java:2472
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2593
+#: build/trans_presets.java:2624 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:3332
+#: build/trans_presets.java:3340 build/trans_presets.java:3389
+#: build/trans_presets.java:3396 build/trans_presets.java:3403
+#: build/trans_presets.java:3411 build/trans_presets.java:3418
+#: build/trans_presets.java:3427 build/trans_presets.java:3436
+#: build/trans_presets.java:3443 build/trans_presets.java:3453
+#: build/trans_presets.java:3462 build/trans_presets.java:3468
+#: build/trans_presets.java:3476 build/trans_presets.java:3482
+#: build/trans_presets.java:3490 build/trans_presets.java:3499
+#: build/trans_presets.java:3505 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3526
+#: build/trans_presets.java:3533 build/trans_presets.java:3539
+#: build/trans_presets.java:3548 build/trans_presets.java:3556
+#: build/trans_presets.java:3562 build/trans_presets.java:3571
+#: build/trans_presets.java:3580 build/trans_presets.java:3586
+#: build/trans_presets.java:3592 build/trans_presets.java:3602
+#: build/trans_presets.java:3610 build/trans_presets.java:3627
+#: build/trans_presets.java:3636 build/trans_presets.java:3643
+#: build/trans_presets.java:3649 build/trans_presets.java:3655
+#: build/trans_presets.java:3664 build/trans_presets.java:3673
+#: build/trans_presets.java:3681 build/trans_presets.java:3688
+#: build/trans_presets.java:3696 build/trans_presets.java:3703
+#: build/trans_presets.java:3712 build/trans_presets.java:3719
+#: build/trans_presets.java:3728 build/trans_presets.java:3737
+#: build/trans_presets.java:3746 build/trans_presets.java:3753
+#: build/trans_presets.java:3762 build/trans_presets.java:3768
+#: build/trans_presets.java:3775 build/trans_presets.java:3784
+#: build/trans_presets.java:3790 build/trans_presets.java:3799
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -23995,5 +24616,5 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
 #. item "Health/Dentist" combo "Opening Hours" display value
@@ -24038,126 +24659,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2422 build/trans_presets.java:2428
-#: build/trans_presets.java:2436 build/trans_presets.java:2479
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:3176 build/trans_presets.java:3184
-#: build/trans_presets.java:3233 build/trans_presets.java:3240
-#: build/trans_presets.java:3247 build/trans_presets.java:3255
-#: build/trans_presets.java:3262 build/trans_presets.java:3287
-#: build/trans_presets.java:3312 build/trans_presets.java:3320
-#: build/trans_presets.java:3326 build/trans_presets.java:3334
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3400 build/trans_presets.java:3406
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3446 build/trans_presets.java:3454
-#: build/trans_presets.java:3487 build/trans_presets.java:3493
-#: build/trans_presets.java:3499 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3540
-#: build/trans_presets.java:3547 build/trans_presets.java:3563
-#: build/trans_presets.java:3597 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3634
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2438
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3443
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3505 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3526
+#: build/trans_presets.java:3533 build/trans_presets.java:3539
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3719
+#: build/trans_presets.java:3753 build/trans_presets.java:3768
+#: build/trans_presets.java:3775 build/trans_presets.java:3790
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1602
 msgid "With shop"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1602
 msgid "convenience"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1602
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1603
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1470
+#: build/trans_presets.java:1604
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1605
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1606
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1607
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1608
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1609
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1610
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1477
+#: build/trans_presets.java:1611
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1612
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1613
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1480
+#: build/trans_presets.java:1614
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1615
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1616
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1483
+#: build/trans_presets.java:1617
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24165,5 +24786,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1620
 msgid "Charging Station"
 msgstr ""
@@ -24171,20 +24792,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1622
 msgid "Edit Charging Station (for electric cars)"
 msgstr "Lisa andmeid"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1492
+#: build/trans_presets.java:1626
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1628
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1629
 msgid "Edit Car Wash"
 msgstr "Lisa andmeid"
@@ -24192,5 +24813,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1637
 msgid "Car Dealer"
 msgstr "Automüüja"
@@ -24198,5 +24819,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1639
 msgid "Edit Car Shop"
 msgstr "Lisa andmeid"
@@ -24204,20 +24825,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1510 build/trans_presets.java:1572
+#: build/trans_presets.java:1644 build/trans_presets.java:1706
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1645
 msgid "Edit Car Repair"
 msgstr "Lisa andmeid"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1652
 msgid "Tyres"
 msgstr ""
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1653
 msgid "Edit Tyres"
 msgstr "Lisa andmeid"
@@ -24225,5 +24846,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1525 build/trans_presets.java:1577
+#: build/trans_presets.java:1659 build/trans_presets.java:1711
 msgid "Contact:"
 msgstr ""
@@ -24267,15 +24888,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1526 build/trans_presets.java:1578
-#: build/trans_presets.java:1811 build/trans_presets.java:1829
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1880 build/trans_presets.java:1897
-#: build/trans_presets.java:1919 build/trans_presets.java:1936
-#: build/trans_presets.java:1959 build/trans_presets.java:1978
-#: build/trans_presets.java:1995 build/trans_presets.java:2014
-#: build/trans_presets.java:2033 build/trans_presets.java:2049
-#: build/trans_presets.java:2066 build/trans_presets.java:2081
-#: build/trans_presets.java:2313 build/trans_presets.java:2469
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:1660 build/trans_presets.java:1712
+#: build/trans_presets.java:1945 build/trans_presets.java:1963
+#: build/trans_presets.java:1979 build/trans_presets.java:1996
+#: build/trans_presets.java:2014 build/trans_presets.java:2031
+#: build/trans_presets.java:2053 build/trans_presets.java:2070
+#: build/trans_presets.java:2093 build/trans_presets.java:2112
+#: build/trans_presets.java:2129 build/trans_presets.java:2148
+#: build/trans_presets.java:2167 build/trans_presets.java:2183
+#: build/trans_presets.java:2200 build/trans_presets.java:2215
+#: build/trans_presets.java:2448 build/trans_presets.java:2613
+#: build/trans_presets.java:4248
 msgid "Phone Number"
 msgstr "Telefoninumber"
@@ -24300,14 +24921,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1527 build/trans_presets.java:1579
-#: build/trans_presets.java:1812 build/trans_presets.java:1830
-#: build/trans_presets.java:1846 build/trans_presets.java:1863
-#: build/trans_presets.java:1881 build/trans_presets.java:1898
-#: build/trans_presets.java:1920 build/trans_presets.java:1937
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1996 build/trans_presets.java:2015
-#: build/trans_presets.java:2034 build/trans_presets.java:2050
-#: build/trans_presets.java:2067 build/trans_presets.java:2082
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:1661 build/trans_presets.java:1713
+#: build/trans_presets.java:1946 build/trans_presets.java:1964
+#: build/trans_presets.java:1980 build/trans_presets.java:1997
+#: build/trans_presets.java:2015 build/trans_presets.java:2032
+#: build/trans_presets.java:2054 build/trans_presets.java:2071
+#: build/trans_presets.java:2094 build/trans_presets.java:2113
+#: build/trans_presets.java:2130 build/trans_presets.java:2149
+#: build/trans_presets.java:2168 build/trans_presets.java:2184
+#: build/trans_presets.java:2201 build/trans_presets.java:2216
+#: build/trans_presets.java:4249
 msgid "Fax Number"
 msgstr "Faksinumber"
@@ -24334,14 +24955,14 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1528 build/trans_presets.java:1580
-#: build/trans_presets.java:1813 build/trans_presets.java:1831
-#: build/trans_presets.java:1847 build/trans_presets.java:1864
-#: build/trans_presets.java:1882 build/trans_presets.java:1899
-#: build/trans_presets.java:1921 build/trans_presets.java:1938
-#: build/trans_presets.java:1961 build/trans_presets.java:1980
-#: build/trans_presets.java:1997 build/trans_presets.java:2016
-#: build/trans_presets.java:2035 build/trans_presets.java:2051
-#: build/trans_presets.java:2068 build/trans_presets.java:2083
-#: build/trans_presets.java:2314 build/trans_presets.java:4088
+#: build/trans_presets.java:1662 build/trans_presets.java:1714
+#: build/trans_presets.java:1947 build/trans_presets.java:1965
+#: build/trans_presets.java:1981 build/trans_presets.java:1998
+#: build/trans_presets.java:2016 build/trans_presets.java:2033
+#: build/trans_presets.java:2055 build/trans_presets.java:2072
+#: build/trans_presets.java:2095 build/trans_presets.java:2114
+#: build/trans_presets.java:2131 build/trans_presets.java:2150
+#: build/trans_presets.java:2169 build/trans_presets.java:2185
+#: build/trans_presets.java:2202 build/trans_presets.java:2217
+#: build/trans_presets.java:2449 build/trans_presets.java:4251
 msgid "Website"
 msgstr "Veebileht"
@@ -24366,14 +24987,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1529 build/trans_presets.java:1581
-#: build/trans_presets.java:1814 build/trans_presets.java:1832
-#: build/trans_presets.java:1848 build/trans_presets.java:1865
-#: build/trans_presets.java:1883 build/trans_presets.java:1900
-#: build/trans_presets.java:1922 build/trans_presets.java:1939
-#: build/trans_presets.java:1962 build/trans_presets.java:1981
-#: build/trans_presets.java:1998 build/trans_presets.java:2017
-#: build/trans_presets.java:2036 build/trans_presets.java:2052
-#: build/trans_presets.java:2069 build/trans_presets.java:2084
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:1663 build/trans_presets.java:1715
+#: build/trans_presets.java:1948 build/trans_presets.java:1966
+#: build/trans_presets.java:1982 build/trans_presets.java:1999
+#: build/trans_presets.java:2017 build/trans_presets.java:2034
+#: build/trans_presets.java:2056 build/trans_presets.java:2073
+#: build/trans_presets.java:2096 build/trans_presets.java:2115
+#: build/trans_presets.java:2132 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2186
+#: build/trans_presets.java:2203 build/trans_presets.java:2218
+#: build/trans_presets.java:4252
 msgid "Email Address"
 msgstr "E-posti aadress"
@@ -24383,6 +25004,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1532 build/trans_presets.java:1571
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1666 build/trans_presets.java:1705
+#: build/trans_presets.java:1740
 msgid "Rental"
 msgstr ""
@@ -24391,10 +25012,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1669
 msgid "Edit Car Rental"
 msgstr "Lisa andmeid"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1676
 msgid "Sharing"
 msgstr ""
@@ -24402,10 +25023,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1678
 msgid "Edit Car Sharing"
 msgstr "Lisa andmeid"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1688
 msgid "Edit Motorcycle Parking"
 msgstr "Lisa andmeid"
@@ -24413,10 +25034,10 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1557 build/trans_presets.java:1590
+#: build/trans_presets.java:1691 build/trans_presets.java:1724
 msgid "Capacity"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1695
 msgid "Motorcycle Dealer"
 msgstr "Motopood"
@@ -24424,25 +25045,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1697
 msgid "Edit Shop Motorcycle"
 msgstr "Lisa andmeid"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1700
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1703
 msgid "Services:"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "yes"
@@ -24450,5 +25071,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "brand"
@@ -24456,5 +25077,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "used"
@@ -24462,5 +25083,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "no"
@@ -24471,6 +25092,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1571 build/trans_presets.java:1572
-#: build/trans_presets.java:1574 build/trans_presets.java:1575
+#: build/trans_presets.java:1705 build/trans_presets.java:1706
+#: build/trans_presets.java:1708 build/trans_presets.java:1709
 msgid "brand"
 msgstr ""
@@ -24478,35 +25099,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1572 build/trans_presets.java:1574
+#: build/trans_presets.java:1706 build/trans_presets.java:1708
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "Safety inspection"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "DEKRA"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "GTÜ"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "MOT"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1708
 msgid "Parts"
 msgstr ""
@@ -24516,6 +25137,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1575 build/trans_presets.java:2533
-#: build/trans_presets.java:3329 build/trans_presets.java:3330
+#: build/trans_presets.java:1709 build/trans_presets.java:2678
+#: build/trans_presets.java:3485 build/trans_presets.java:3486
 msgid "Clothes"
 msgstr "Riided"
@@ -24523,10 +25144,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1721
 msgid "Edit Bicycle Parking"
 msgstr "Lisa andmeid"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1726
 msgid "Bike Dealer"
 msgstr "Jalgrattamüüja"
@@ -24535,40 +25156,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1729
 msgid "Edit Bicycle Shop"
 msgstr "Lisa andmeid"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1732
 msgid "Bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1733
 msgid "Second-hand bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1734
 msgid "Bicycles are repaired"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1735
 msgid "Bicycles are rented"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1736
 msgid "Free bicycle pump"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1737
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1738
 msgid "Bicycles are washed (for a fee)"
 msgstr ""
@@ -24577,10 +25198,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1743
 msgid "Edit Bicycle Rental"
 msgstr "Lisa andmeid"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1748
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -24588,5 +25209,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1749
 msgctxt "railway"
 msgid "Station"
@@ -24596,5 +25217,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1752
 msgctxt "railway"
 msgid "Edit Station"
@@ -24602,5 +25223,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1757
 msgid "UIC-Reference"
 msgstr ""
@@ -24608,5 +25229,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1760
 msgid "Railway Halt"
 msgstr ""
@@ -24614,5 +25235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1762
 msgid "Edit Halt"
 msgstr "Lisa andmeid"
@@ -24620,5 +25241,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1769
 msgid "Tram Stop"
 msgstr ""
@@ -24627,5 +25248,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1772
 msgid "Edit Tram Stop"
 msgstr "Lisa andmeid"
@@ -24633,5 +25254,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1779
 msgid "Railway Platform"
 msgstr "Raudteeplatvorm"
@@ -24640,5 +25261,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1782
 msgid "Edit Railway Platform"
 msgstr "Lisa andmeid"
@@ -24650,5 +25271,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1651 build/trans_presets.java:1696
+#: build/trans_presets.java:1785 build/trans_presets.java:1830
 msgid "Reference (track number)"
 msgstr ""
@@ -24657,11 +25278,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1653 build/trans_presets.java:1698
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:1787 build/trans_presets.java:1832
+#: build/trans_presets.java:2336
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1789
 msgid "Subway Entrance"
 msgstr "Metroo sissepääs"
@@ -24670,5 +25291,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1792
 msgid "Edit Subway Entrance"
 msgstr "Lisa andmeid"
@@ -24676,5 +25297,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1663 build/trans_presets.java:2490
+#: build/trans_presets.java:1797 build/trans_presets.java:2635
 msgid "Wheelchair"
 msgstr ""
@@ -24683,5 +25304,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1802
 msgid "Bus Station"
 msgstr ""
@@ -24690,5 +25311,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1805
 msgid "Edit Bus Station"
 msgstr "Lisa andmeid"
@@ -24696,5 +25317,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1811
 msgid "Bus Stop"
 msgstr ""
@@ -24704,5 +25325,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1815
 msgid "Edit Bus Stop"
 msgstr "Lisa andmeid"
@@ -24711,6 +25332,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1686 build/trans_presets.java:2553
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:1820 build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -24722,10 +25343,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1687 build/trans_presets.java:2545
+#: build/trans_presets.java:1821 build/trans_presets.java:2690
 msgid "Bench"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1822
 msgid "Tactile Paving"
 msgstr ""
@@ -24733,10 +25354,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1826
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1827
 msgid "Edit Bus Platform"
 msgstr "Lisa andmeid"
@@ -24744,10 +25365,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1835
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1841
 msgid "Reference Number"
 msgstr "Viitenumber"
@@ -24756,6 +25377,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1708 build/trans_presets.java:2504
-#: build/trans_presets.java:3654
+#: build/trans_presets.java:1842 build/trans_presets.java:2649
+#: build/trans_presets.java:3810
 msgid "Coins"
 msgstr "Mündid"
@@ -24764,6 +25385,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2505
-#: build/trans_presets.java:3655
+#: build/trans_presets.java:1843 build/trans_presets.java:2650
+#: build/trans_presets.java:3811
 msgid "Notes"
 msgstr "Märkused"
@@ -24772,6 +25393,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1710 build/trans_presets.java:2506
-#: build/trans_presets.java:3656
+#: build/trans_presets.java:1844 build/trans_presets.java:2651
+#: build/trans_presets.java:3812
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroonilised rahakotid ja krediitkaardid"
@@ -24780,6 +25401,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1711 build/trans_presets.java:2507
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:1845 build/trans_presets.java:2652
+#: build/trans_presets.java:3813
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -24788,6 +25409,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1712 build/trans_presets.java:2508
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:1846 build/trans_presets.java:2653
+#: build/trans_presets.java:3814
 msgid "Credit cards"
 msgstr "Krediitkaart"
@@ -24795,10 +25416,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1713 build/trans_presets.java:3659
+#: build/trans_presets.java:1847 build/trans_presets.java:3815
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Taxi"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1850
 msgid "Taxi"
 msgstr "Takso"
@@ -24806,5 +25427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1852
 msgid "Edit Taxi station"
 msgstr "Lisa andmeid"
@@ -24812,10 +25433,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1857
 msgid "Airport"
 msgstr ""
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1858
 msgid "Airport Ground"
 msgstr "Lennujaam"
@@ -24823,5 +25444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1860
 msgid "Edit Airport Ground"
 msgstr "Lisa andmeid"
@@ -24829,10 +25450,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1864
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1865
 msgid "ICAO"
 msgstr ""
@@ -24841,5 +25462,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1870
 msgid "Runway"
 msgstr ""
@@ -24847,5 +25468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1872
 msgid "Edit Runway"
 msgstr "Lisa andmeid"
@@ -24853,5 +25474,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1878
 msgid "Taxiway"
 msgstr "Ruleerimistee"
@@ -24859,5 +25480,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1880
 msgid "Edit Taxiway"
 msgstr "Lisa andmeid"
@@ -24865,5 +25486,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1886
 msgid "Helipad"
 msgstr "Kopteriväljak"
@@ -24871,5 +25492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1888
 msgid "Edit Helipad"
 msgstr "Lisa andmeid"
@@ -24879,5 +25500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1760 build/trans_presets.java:1762
+#: build/trans_presets.java:1894 build/trans_presets.java:1896
 msgid "Apron"
 msgstr "Perroon"
@@ -24887,5 +25508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1765 build/trans_presets.java:1767
+#: build/trans_presets.java:1899 build/trans_presets.java:1901
 msgid "Hangar"
 msgstr "Angaar"
@@ -24896,6 +25517,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1770 build/trans_presets.java:1772
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:1904 build/trans_presets.java:1906
+#: build/trans_presets.java:3204
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -24905,5 +25526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1775 build/trans_presets.java:1777
+#: build/trans_presets.java:1909 build/trans_presets.java:1911
 msgid "Windsock"
 msgstr "Tuulekott"
@@ -24912,5 +25533,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1915
 msgid "Terminal"
 msgstr "Terminal"
@@ -24918,10 +25539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1917
 msgid "Edit Terminal"
 msgstr "Lisa andmeid"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1921
 msgctxt "airport"
 msgid "Gate"
@@ -24930,15 +25551,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1923
 msgid "Edit Terminal Gate"
 msgstr "Värav"
 
 #. group "Facilities"
-#: build/trans_presets.java:1795 build/trans_presets.java:2482
+#: build/trans_presets.java:1929 build/trans_presets.java:2627
 msgid "Facilities"
 msgstr "Teenused"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1930
 msgid "Accommodation"
 msgstr "Majutus"
@@ -24950,5 +25571,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1797 build/trans_surveyor.java:43
+#: build/trans_presets.java:1931 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -24957,5 +25578,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1934
 msgid "Edit Hotel"
 msgstr "Lisa andmeid"
@@ -24969,8 +25590,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1804 build/trans_presets.java:1822
-#: build/trans_presets.java:1838 build/trans_presets.java:1855
-#: build/trans_presets.java:1873 build/trans_presets.java:1907
-#: build/trans_presets.java:1929 build/trans_presets.java:1952
+#: build/trans_presets.java:1938 build/trans_presets.java:1956
+#: build/trans_presets.java:1972 build/trans_presets.java:1989
+#: build/trans_presets.java:2007 build/trans_presets.java:2041
+#: build/trans_presets.java:2063 build/trans_presets.java:2086
 msgid "Stars"
 msgstr "Tähti"
@@ -25006,12 +25627,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "Internet access"
 msgstr "Internetiühendus"
@@ -25032,12 +25653,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "wlan"
 msgstr ""
@@ -25058,12 +25679,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "wired"
 msgstr ""
@@ -25090,12 +25711,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061 build/trans_style.java:1069
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195 build/trans_style.java:1069
 msgid "terminal"
 msgstr "terminal"
@@ -25116,12 +25737,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1807 build/trans_presets.java:1825
-#: build/trans_presets.java:1841 build/trans_presets.java:1858
-#: build/trans_presets.java:1876 build/trans_presets.java:1893
-#: build/trans_presets.java:1910 build/trans_presets.java:1932
-#: build/trans_presets.java:1955 build/trans_presets.java:1974
-#: build/trans_presets.java:1991 build/trans_presets.java:2010
-#: build/trans_presets.java:2029 build/trans_presets.java:2045
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:1941 build/trans_presets.java:1959
+#: build/trans_presets.java:1975 build/trans_presets.java:1992
+#: build/trans_presets.java:2010 build/trans_presets.java:2027
+#: build/trans_presets.java:2044 build/trans_presets.java:2066
+#: build/trans_presets.java:2089 build/trans_presets.java:2108
+#: build/trans_presets.java:2125 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2179
+#: build/trans_presets.java:2196
 msgid "Internet access fee"
 msgstr "Tasuline internetiühendus"
@@ -25144,12 +25765,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "Smoking"
 msgstr "Suitsetamine"
@@ -25171,12 +25792,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "dedicated"
 msgstr ""
@@ -25198,12 +25819,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "separated"
 msgstr ""
@@ -25225,17 +25846,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "isolated"
 msgstr ""
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1950
 msgid "Motel"
 msgstr "Motell"
@@ -25243,20 +25864,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1818
+#: build/trans_presets.java:1952
 msgid "Edit Motel"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1968
 msgid "Guest House"
 msgstr "Külalistemaja"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1969
 msgid "Edit Guest House"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1984
 msgid "Chalet"
 msgstr ""
@@ -25264,10 +25885,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1986
 msgid "Edit Chalet"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:2001
 msgid "Hostel"
 msgstr ""
@@ -25275,15 +25896,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2003
 msgid "Edit Hostel"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2019
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2020
 msgid "Edit Alpine Hut"
 msgstr "Lisa andmeid"
@@ -25291,10 +25912,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2037
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2038
 msgid "Edit Caravan Site"
 msgstr "Lisa andmeid"
@@ -25302,30 +25923,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:2048
 msgid "Number of places"
 msgstr "Kohtade arv"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2049
 msgid "Requires a fee"
 msgstr "Tasu"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2049
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2050
 msgid "Power supply"
 msgstr "Elektrivarustus"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2051
 msgid "Tents allowed"
 msgstr "Telkimine lubatud"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:2058
 msgid "Camping Site"
 msgstr "Laagriplats"
@@ -25333,10 +25954,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:2060
 msgid "Edit Camping Site"
 msgstr "Lisa andmeid"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:2076
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -25347,5 +25968,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1943 build/trans_surveyor.java:47
+#: build/trans_presets.java:2077 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -25353,5 +25974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:2079
 msgid "Edit Restaurant"
 msgstr "Lisa andmeid"
@@ -25360,6 +25981,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2140
 msgid "Cuisine"
 msgstr "Rahvuslik köök"
@@ -25367,5 +25988,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "italian"
 msgstr "itaalia"
@@ -25373,5 +25994,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "chinese"
 msgstr "hiina"
@@ -25379,5 +26000,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "pizza"
 msgstr "pizza"
@@ -25385,5 +26006,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "burger"
 msgstr "burger"
@@ -25391,5 +26012,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "greek"
 msgstr "kreeka"
@@ -25397,5 +26018,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "german"
 msgstr "saksa"
@@ -25403,5 +26024,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "indian"
 msgstr "india"
@@ -25409,5 +26030,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "regional"
 msgstr "kohalik"
@@ -25415,5 +26036,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "kebab"
 msgstr "kebab"
@@ -25421,5 +26042,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "turkish"
 msgstr "türgi"
@@ -25427,5 +26048,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "asian"
 msgstr "aasia"
@@ -25433,5 +26054,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "thai"
 msgstr "tai"
@@ -25439,5 +26060,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "mexican"
 msgstr "mehhiko"
@@ -25445,5 +26066,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "japanese"
 msgstr "jaapani"
@@ -25451,5 +26072,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "french"
 msgstr "prantsuse"
@@ -25457,5 +26078,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "sandwich"
 msgstr "võileivad"
@@ -25463,5 +26084,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "sushi"
 msgstr "sushi"
@@ -25469,10 +26090,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1950 build/trans_presets.java:2025
+#: build/trans_presets.java:2084 build/trans_presets.java:2159
 msgid "Microbrewery"
 msgstr "Pisipruulikoda"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2098
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -25480,20 +26101,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2100
 msgid "Edit Fast Food Restaurant"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2104
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2104
 msgid "chicken"
 msgstr "kana"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2117
 msgid "Food Court"
 msgstr "Söögihall"
@@ -25501,10 +26122,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:2119
 msgid "Edit Food Court"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2134
 msgid "Cafe"
 msgstr "Kohvik"
@@ -25512,15 +26133,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2136
 msgid "Edit Cafe"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2140
 msgid "ice_cream"
 msgstr "jäätis"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2153
 msgid "Pub"
 msgstr "Pubi"
@@ -25528,20 +26149,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2155
 msgid "Edit Pub"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2172
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2173
 msgid "Edit Biergarten"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2188
 msgid "Bar"
 msgstr "Baar"
@@ -25549,10 +26170,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2190
 msgid "Edit Bar"
 msgstr "Lisa andmeid"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2205
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -25560,25 +26181,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2207
 msgid "Edit Nightclub"
 msgstr "Lisa andmeid"
 
 #. group "Tourism"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2221
 msgid "Tourism"
 msgstr "Turism"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2222
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2223
 msgid "Edit Attraction"
 msgstr "Lisa andmeid"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2228
 msgid "Viewpoint"
 msgstr "Vaatepunkt"
@@ -25586,10 +26207,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2230
 msgid "Edit Viewpoint"
 msgstr "Lisa andmeid"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2233
 msgid "Look-Out Tower"
 msgstr "Vaatetorn"
@@ -25597,20 +26218,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2236
 msgid "Information Office"
 msgstr "Infopunkt"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2243
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "Detail Grade"
 msgstr "Detailsuse aste"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "topo"
 msgstr "topo"
@@ -25643,5 +26264,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2114 build/trans_presets.java:4188
+#: build/trans_presets.java:2248 build/trans_presets.java:4388
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -25650,25 +26271,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "scheme"
 msgstr "skeem"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "Shown Area"
 msgstr "Näidatud ala"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "site"
 msgstr "objekt"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "city"
 msgstr "linn"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "region"
 msgstr "regioon"
@@ -25677,6 +26298,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2116 build/trans_presets.java:2132
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2250 build/trans_presets.java:2266
+#: build/trans_presets.java:2310
 msgid "Closer Description"
 msgstr "Täpsem kirjeldus"
@@ -25686,5 +26307,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2118 build/trans_presets.java:2141
+#: build/trans_presets.java:2252 build/trans_presets.java:2275
 msgid "Routes shown for:"
 msgstr "Märgitud marsruudid:"
@@ -25692,5 +26313,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2119 build/trans_presets.java:2142
+#: build/trans_presets.java:2253 build/trans_presets.java:2276
 msgid "Hiking"
 msgstr "Matkamine"
@@ -25699,6 +26320,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2120 build/trans_presets.java:2143
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2254 build/trans_presets.java:2277
+#: build/trans_presets.java:2827
 msgid "Cycling"
 msgstr "Jalgrattasõit"
@@ -25706,5 +26327,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2121 build/trans_presets.java:2144
+#: build/trans_presets.java:2255 build/trans_presets.java:2278
 msgid "Mountainbiking"
 msgstr "Mägimatkamine"
@@ -25713,6 +26334,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2122 build/trans_presets.java:2145
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2256 build/trans_presets.java:2279
+#: build/trans_presets.java:2875
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -25720,5 +26341,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2123 build/trans_presets.java:2146
+#: build/trans_presets.java:2257 build/trans_presets.java:2280
 msgid "Riding"
 msgstr "Ratsutamine"
@@ -25726,50 +26347,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2124 build/trans_presets.java:2147
+#: build/trans_presets.java:2258 build/trans_presets.java:2281
 msgid "... other transportation modes possible"
 msgstr "... võimalikud muud transpordiviisid."
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2260
 msgid "Information Board"
 msgstr "Infotahvel"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "Board Content"
 msgstr "Infotahvli sisu"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "notice"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "history"
 msgstr "ajalugu"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "nature"
 msgstr "loodus"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "wildlife"
 msgstr "loomad"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "plants"
 msgstr "taimed"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2268
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2283
 msgid "Information Terminal"
 msgstr "Infoterminal"
@@ -25777,10 +26398,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2154 build/trans_presets.java:2164
+#: build/trans_presets.java:2288 build/trans_presets.java:2298
 msgid "Closer description"
 msgstr "Täpsem kirjeldus"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2293
 msgid "Audioguide"
 msgstr "Audiogiid"
@@ -25788,25 +26409,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2303
 msgid "Audioguide via mobile phone?"
 msgstr "Audiogiid telefonis?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2304
 msgid "Phone number"
 msgstr "Telefoninumber"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2306
 msgid "Other Information Points"
 msgstr "Muud infopuntid"
 
 #. group "Leisure"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2313
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2314
 msgid "Cinema"
 msgstr "Kino"
@@ -25815,10 +26436,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2317
 msgid "Edit Cinema"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2321
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -25827,10 +26448,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2324
 msgid "Edit Zoo"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2330
 msgid "Dog Park"
 msgstr ""
@@ -25839,40 +26460,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2333
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2337
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2337
+msgid "fence"
+msgstr ""
+
+#. item "Leisure/Dog Park" combo "Barrier" display value
+#: build/trans_presets.java:2337
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2341
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2342
 msgid "Edit Theme Park"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2347
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2348
 msgid "Edit Water Park"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2352
 msgid "Sauna"
 msgstr ""
@@ -25882,5 +26508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2219 build/trans_presets.java:2222
+#: build/trans_presets.java:2353 build/trans_presets.java:2356
 msgid "Edit Sauna"
 msgstr "Lisa andmeid"
@@ -25908,20 +26534,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2227 build/trans_presets.java:2337
-#: build/trans_presets.java:2445 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3343
-#: build/trans_presets.java:3392 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3508
-#: build/trans_presets.java:3517 build/trans_presets.java:3556
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3606
-#: build/trans_presets.java:3628 build/trans_presets.java:3643
+#: build/trans_presets.java:2361 build/trans_presets.java:2472
+#: build/trans_presets.java:2593 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3453
+#: build/trans_presets.java:3462 build/trans_presets.java:3499
+#: build/trans_presets.java:3548 build/trans_presets.java:3571
+#: build/trans_presets.java:3580 build/trans_presets.java:3627
+#: build/trans_presets.java:3636 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3712
+#: build/trans_presets.java:3728 build/trans_presets.java:3737
+#: build/trans_presets.java:3746 build/trans_presets.java:3762
+#: build/trans_presets.java:3784 build/trans_presets.java:3799
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2362
 msgid "Access"
 msgstr ""
@@ -25929,5 +26555,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2365
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -25935,15 +26561,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2367
 msgid "Edit Playground"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2371
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2372
 msgid "Edit Picnic Site"
 msgstr "Lisa andmeid"
@@ -25951,10 +26577,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2241 build/trans_presets.java:2557
+#: build/trans_presets.java:2375 build/trans_presets.java:2702
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2377
 msgid "Public Grill"
 msgstr ""
@@ -25962,15 +26588,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2379
 msgid "Edit Public Grill"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2383
 msgid "Covered"
 msgstr "Katusega"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgctxt "grill"
 msgid "Fuel"
@@ -25978,30 +26604,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgid "charcoal"
 msgstr "süsi"
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgid "electric"
 msgstr "elekter"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2386
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2387
 msgid "Edit Fishing"
 msgstr "Lisa andmeid"
 
 #. group "Culture"
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2392
 msgid "Culture"
 msgstr "Kultuur"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2393
 msgid "Museum"
 msgstr "Muuseum"
@@ -26009,10 +26635,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2395
 msgid "Edit Museum"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2401
 msgid "Theatre"
 msgstr "Teater"
@@ -26021,10 +26647,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2404
 msgid "Edit Theatre"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2408
 msgid "Library"
 msgstr "Raamatukogu"
@@ -26033,10 +26659,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2411
 msgid "Edit Library"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2416
 msgid "Arts Centre"
 msgstr "Kunstikeskus"
@@ -26044,10 +26670,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2418
 msgid "Edit Arts Centre"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2422
 msgid "Artwork"
 msgstr "Kunstiteos"
@@ -26055,10 +26681,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2424
 msgid "Edit Artwork"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2428
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -26068,5 +26694,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2432
 msgid "Edit Place of Worship"
 msgstr "Lisa andmeid"
@@ -26075,6 +26701,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "Religion"
 msgstr "Religioon"
@@ -26083,6 +26709,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "bahai"
 msgstr ""
@@ -26091,6 +26717,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "buddhist"
 msgstr "budist"
@@ -26099,6 +26725,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "christian"
 msgstr "kristlane"
@@ -26107,6 +26733,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "hindu"
 msgstr "hindu"
@@ -26115,6 +26741,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "jain"
 msgstr ""
@@ -26123,6 +26749,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "jewish"
 msgstr "juudi"
@@ -26131,6 +26757,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "muslim"
 msgstr "moslem"
@@ -26139,6 +26765,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "sikh"
 msgstr "sikh"
@@ -26147,6 +26773,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "spiritualist"
 msgstr "spiritualist"
@@ -26155,6 +26781,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "taoist"
 msgstr "taoist"
@@ -26163,6 +26789,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "unitarian"
 msgstr ""
@@ -26171,6 +26797,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
@@ -26179,6 +26805,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -26187,6 +26813,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "anglican"
 msgstr "anglikaan"
@@ -26195,6 +26821,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "baptist"
 msgstr "baptist"
@@ -26203,6 +26829,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "catholic"
 msgstr "katoliku"
@@ -26211,6 +26837,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "evangelical"
 msgstr "evangeelne"
@@ -26219,6 +26845,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
@@ -26227,6 +26853,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "lutheran"
 msgstr "luterlane"
@@ -26235,6 +26861,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "methodist"
 msgstr "metodist"
@@ -26243,6 +26869,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "mormon"
 msgstr "mormoon"
@@ -26251,6 +26877,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "orthodox"
 msgstr "ortodoksne"
@@ -26259,6 +26885,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "pentecostal"
 msgstr "nelipühalane"
@@ -26267,6 +26893,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "presbyterian"
 msgstr "presbüterlane"
@@ -26275,6 +26901,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "protestant"
 msgstr "protestantlik"
@@ -26283,6 +26909,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "quaker"
 msgstr "kveeker"
@@ -26291,6 +26917,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "shia"
 msgstr "šiia"
@@ -26299,11 +26925,38 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "sunni"
 msgstr ""
 
+#. item "Culture/Place of Worship" combo "Service Times"
+#: build/trans_presets.java:2437
+#, fuzzy
+msgid "Service Times"
+msgstr "Teenindus"
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 10:00"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 10:30"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 11:00"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting"
+#: build/trans_presets.java:2438
+#, fuzzy
+msgid "Opening Hours for visiting"
+msgstr "Avatud"
+
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2440
 msgid "Recording Studio"
 msgstr "Salvestusstuudio"
@@ -26311,15 +26964,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2442
 msgid "Edit Studio"
 msgstr "Lisa andmeid"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2447
 msgid "audio"
 msgstr "heli"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2447
 msgid "video"
 msgstr "video"
@@ -26327,5 +26980,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2317 build/trans_presets.java:2318
+#: build/trans_presets.java:2452 build/trans_presets.java:2453
 msgid "Public Building"
 msgstr "Ühiskondlik hoone"
@@ -26333,10 +26986,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2455
 msgid "Edit Public Building"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2459
 msgid "Town hall"
 msgstr "Raekoda"
@@ -26344,5 +26997,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2461
 msgid "Edit Town hall"
 msgstr "Lisa andmeid"
@@ -26351,10 +27004,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2330 build/trans_presets.java:2332
+#: build/trans_presets.java:2465 build/trans_presets.java:2467
 msgid "Community Centre"
 msgstr "Külakeskus"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2474
 msgid "Embassy"
 msgstr "Saatkond"
@@ -26362,10 +27015,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2476
 msgid "Edit Embassy"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2480
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -26374,10 +27027,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2483
 msgid "Edit Courthouse"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2487
 msgid "Prison"
 msgstr "Vangla"
@@ -26386,10 +27039,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2490
 msgid "Edit Prison"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2494
 msgid "Police"
 msgstr "Politsei"
@@ -26399,10 +27052,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2498
 msgid "Edit Police"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2502
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -26411,10 +27064,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2505
 msgid "Edit Fire Station"
 msgstr "Lisa andmeid"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2509
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26422,25 +27075,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2511
 msgid "Edit Post Office"
 msgstr "Lisa andmeid"
 
 #. group "Education"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2517
 msgid "Education"
 msgstr "Haridus"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2518
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2519
 msgid "Edit Kindergarten"
 msgstr "Lisa andmeid"
 
 #. item "Education/School"
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2523
 msgid "School"
 msgstr "Kool"
@@ -26448,10 +27101,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2525
 msgid "Edit School"
 msgstr "Lisa andmeid"
 
 #. item "Education/University"
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2529
 msgid "University"
 msgstr "Ülikool"
@@ -26459,10 +27112,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2531
 msgid "Edit University"
 msgstr "Lisa andmeid"
 
 #. item "Education/College"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2535
 msgid "College"
 msgstr "Rakenduskõrgkool"
@@ -26470,10 +27123,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2537
 msgid "Edit College"
 msgstr "Lisa andmeid"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2541
 msgid "Driving School"
 msgstr "Sõidukool"
@@ -26481,20 +27134,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2543
 msgid "Edit Driving School"
 msgstr "Lisa andmeid"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2548
 msgid "License Classes"
 msgstr "Juhtimisõiguse kategooriad"
 
 #. group "Health"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2551
 msgid "Health"
 msgstr "Tervis"
 
+#. item "Health/Hospital"
+#: build/trans_presets.java:2552
+msgid "Hospital"
+msgstr "Haigla"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#. item "Health/Hospital" label "Edit Hospital"
+#: build/trans_presets.java:2554
+msgid "Edit Hospital"
+msgstr "Lisa andmeid"
+
 #. item "Health/Doctors"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Arstid"
@@ -26502,20 +27166,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2560
 msgid "Edit Doctors"
 msgstr "Lisa andmeid"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2565
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2566
 msgid "Edit Dentist"
 msgstr "Lisa andmeid"
 
+#. item "Health/Nursing Home"
+#: build/trans_presets.java:2571
+#, fuzzy
+msgid "Nursing Home"
+msgstr "Nummerdussüsteem"
+
+#. item "Health/Nursing Home" label "Edit Nursing Home"
+#: build/trans_presets.java:2572
+#, fuzzy
+msgid "Edit Nursing Home"
+msgstr "Lisa andmeid"
+
+#. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2578
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -26523,5 +27200,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2580
 msgid "Edit Pharmacy"
 msgstr "Lisa andmeid"
@@ -26529,10 +27206,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2582
 msgid "Dispensing"
 msgstr "Retseptuur"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2586
 msgid "Hearing Aids"
 msgstr ""
@@ -26540,21 +27217,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2588
 msgid "Edit Hearing Aids"
 msgstr "Lisa andmeid"
 
-#. item "Health/Hospital"
-#: build/trans_presets.java:2447
-msgid "Hospital"
-msgstr "Haigla"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2449
-msgid "Edit Hospital"
-msgstr "Lisa andmeid"
-
+#. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2596
 msgid "Baby Hatch"
 msgstr ""
@@ -26562,10 +27229,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2598
 msgid "Edit Baby Hatch"
 msgstr "Lisa andmeid"
 
+#. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2604
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -26574,5 +27242,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2607
 msgid "Edit Emergency Access Point"
 msgstr "Lisa andmeid"
@@ -26581,21 +27249,22 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2610
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2611
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2614
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Kasuta riigikoodi, näiteks +12-345-67890)"
 
 #. <space />
+#. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2618
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -26604,10 +27273,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2621
 msgid "Edit Veterinary"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2635
 msgid "limited"
 msgstr ""
@@ -26615,15 +27284,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2491 build/trans_presets.java:3653
+#: build/trans_presets.java:2636 build/trans_presets.java:3809
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2638
 msgid "Post Box"
 msgstr "Postkast"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2643
 msgid "Telephone"
 msgstr "Telefon"
@@ -26632,15 +27301,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2646
 msgid "Edit Telephone"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2654
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2656
 msgid "Clock"
 msgstr "Kell"
@@ -26649,5 +27318,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2659
 msgid "Edit Clock"
 msgstr "Lisa andmeid"
@@ -26657,5 +27326,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
 msgid "Display"
 msgstr "Ekraan"
@@ -26663,5 +27332,7 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
 msgid "analog"
 msgstr "analoog"
@@ -26669,75 +27340,81 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
 msgid "digital"
 msgstr "digitaalne"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2662
+#, fuzzy
+msgctxt "display"
 msgid "sundial"
 msgstr "päikesekell"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2662
+#, fuzzy
+msgctxt "display"
 msgid "unorthodox"
 msgstr "ebaharilik"
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "Support"
 msgstr "Kinnitus"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "pole"
 msgstr "post"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "wall_mounted"
 msgstr "seinakell"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "billboard"
 msgstr "reklaamtahvel"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "Visibility/readability"
 msgstr "Nähtavus/loetavus"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(up to 5m)"
 msgstr "(kuni 5m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(up to 20m)"
 msgstr "(kuni 20m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(more than 20m)"
 msgstr "(üle 20m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2665
 msgid "Shows current date"
 msgstr "Näitab kuupäeva"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2666
 msgid "Shows temperature"
 msgstr "Näitab temperatuuri"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2667
 msgid "Shows barometric pressure"
 msgstr "Näitab õhurõhku"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2668
 msgid "Shows humidity"
 msgstr "Näitab niiskust"
@@ -26745,5 +27422,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2671
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -26752,5 +27429,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2674
 msgid "Edit Recycling station"
 msgstr "Lisa andmeid"
@@ -26758,40 +27435,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2676
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2677
 msgid "Cans"
 msgstr "Purgid"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2679
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2680
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2681
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2682
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2682
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2684
 msgid "Waste Basket"
 msgstr "Prügikorv"
@@ -26799,5 +27476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2686
 msgid "Edit Waste Basket"
 msgstr "Lisa andmeid"
@@ -26806,30 +27483,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2693
 msgid "Backrest"
 msgstr "Seljatugi"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "stone"
 msgstr "kivi"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "plastic"
 msgstr "plastikust"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "black"
@@ -26837,5 +27514,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "brown"
@@ -26843,5 +27520,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "green"
@@ -26849,5 +27526,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "red"
@@ -26855,5 +27532,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "blue"
@@ -26861,5 +27538,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "gray"
@@ -26867,5 +27544,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "white"
@@ -26873,20 +27550,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2696
 msgid "Amount of Seats"
 msgstr "Istekohtade arv"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2699
 msgid "Edit Shelter"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgid "Type of shelter"
 msgstr ""
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -26894,5 +27571,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "public_transport"
@@ -26900,5 +27577,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -26906,5 +27583,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -26912,10 +27589,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2705
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2706
 msgid "Edit Hunting Stand"
 msgstr "Lisa andmeid"
@@ -26924,10 +27601,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2563 build/trans_presets.java:3837
+#: build/trans_presets.java:2708 build/trans_presets.java:4000
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -26935,20 +27612,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 msgid "half"
 msgstr "pool"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 msgid "full"
 msgstr "täis"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2710
 msgid "Hide"
 msgstr "Peida"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2711
 msgid "Lock"
 msgstr "Lukusta"
@@ -26956,5 +27633,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2714
 msgid "Drinking Water"
 msgstr "Joogivesi"
@@ -26963,10 +27640,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2717
 msgid "Edit Drinking Water"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2721
 msgid "Fire Hydrant"
 msgstr "Tuletõrjehüdrant"
@@ -26975,5 +27652,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2724
 msgid "Edit Fire Hydrant"
 msgstr "Lisa andmeid"
@@ -26981,5 +27658,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2581 build/trans_presets.java:2979
+#: build/trans_presets.java:2726 build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "underground"
@@ -26987,5 +27664,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "pillar"
@@ -26993,5 +27670,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "wall"
@@ -26999,5 +27676,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "pond"
@@ -27005,10 +27682,10 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2727
 msgid "Diameter"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "lane"
@@ -27016,5 +27693,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -27022,5 +27699,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27028,5 +27705,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "green"
@@ -27034,20 +27711,20 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "Pressure"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "xx l/min"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "suction"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2735
 msgid "Count"
 msgstr ""
@@ -27055,20 +27732,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2594 build/trans_presets.java:3358
+#: build/trans_presets.java:2739 build/trans_presets.java:3514
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2740
 msgid "Sport Facilities"
 msgstr "Spordirajatised"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2741
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2742
 msgid "Edit Stadium"
 msgstr "Lisa andmeid"
@@ -27082,6 +27759,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2601 build/trans_presets.java:2610
-#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2773
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -27427,6 +28104,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -27464,6 +28141,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "multi"
 msgstr ""
@@ -27473,6 +28150,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "archery"
 msgstr "vibusport"
@@ -27482,6 +28159,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "athletics"
 msgstr ""
@@ -27491,6 +28168,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "american_football"
 msgstr ""
@@ -27500,6 +28177,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "australian_football"
 msgstr ""
@@ -27509,6 +28186,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "baseball"
 msgstr "pesapall"
@@ -27518,6 +28195,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "basketball"
 msgstr "korvpall"
@@ -27527,6 +28204,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "boules"
 msgstr ""
@@ -27536,6 +28213,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "bowls"
 msgstr ""
@@ -27545,6 +28222,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "canadian_football"
 msgstr ""
@@ -27554,6 +28231,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "canoe"
 msgstr "kanuu"
@@ -27563,6 +28240,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "climbing"
 msgstr ""
@@ -27572,6 +28249,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cricket"
 msgstr ""
@@ -27581,6 +28258,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cricket_nets"
 msgstr ""
@@ -27590,6 +28267,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "croquet"
 msgstr ""
@@ -27599,6 +28276,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cycling"
 msgstr ""
@@ -27608,6 +28285,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "dog_racing"
 msgstr ""
@@ -27617,6 +28294,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "equestrian"
 msgstr ""
@@ -27626,6 +28303,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "gaelic_football"
 msgstr ""
@@ -27635,6 +28312,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "golf"
 msgstr "golf"
@@ -27644,6 +28321,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "gymnastics"
 msgstr ""
@@ -27653,6 +28330,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "hockey"
 msgstr ""
@@ -27662,6 +28339,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "horse_racing"
 msgstr ""
@@ -27671,6 +28348,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "motor"
 msgstr ""
@@ -27680,6 +28357,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "pelota"
 msgstr ""
@@ -27689,6 +28366,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "racquet"
 msgstr ""
@@ -27698,6 +28375,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "rugby_league"
 msgstr ""
@@ -27707,6 +28384,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "rugby_union"
 msgstr ""
@@ -27716,6 +28393,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "shooting"
 msgstr ""
@@ -27725,6 +28402,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skateboard"
 msgstr "rula"
@@ -27734,6 +28411,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skating"
 msgstr "uisutamine"
@@ -27743,6 +28420,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skiing"
 msgstr "suusatamine"
@@ -27752,6 +28429,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "soccer"
 msgstr "jalgpall"
@@ -27761,6 +28438,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "swimming"
 msgstr "ujumine"
@@ -27770,6 +28447,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "table_tennis"
 msgstr "lauatennis"
@@ -27779,71 +28456,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "tennis"
 msgstr "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2750
 msgid "Sports Centre"
 msgstr "Spordikeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2751
 msgid "Edit Sports Centre"
 msgstr "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2759
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2760
 msgid "Edit Pitch"
 msgstr "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2768
 msgid "Racetrack"
 msgstr "Võidusõidurada"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2769
 msgid "Edit Racetrack"
 msgstr "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2777
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2778
 msgid "Edit Golf Course"
 msgstr "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2783
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2784
 msgid "Edit Miniature Golf"
 msgstr "Lisa andmeid"
 
 #. group "Sport"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2790
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2791
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2792
 msgid "Edit Multi"
 msgstr "Lisa andmeid"
@@ -27891,25 +28568,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: 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:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "type"
 msgstr "tüüp"
@@ -27959,26 +28636,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: 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:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "pitch"
 msgstr ""
@@ -28028,26 +28705,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: 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:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "sports_centre"
 msgstr "spordihall"
@@ -28092,24 +28769,24 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: 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:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3037
 msgid "stadium"
 msgstr "staadion"
@@ -28157,150 +28834,150 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: 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:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "track"
 msgstr "rada"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2797
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2798
 msgid "Edit 10pin"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2803
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2804
 msgid "Edit Athletics"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2809
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2810
 msgid "Edit Archery"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2815
 msgid "Climbing"
 msgstr "Ronimine"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2816
 msgid "Edit Climbing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2821
 msgid "Canoeing"
 msgstr "Kanuusõit"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2822
 msgid "Edit Canoeing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2828
 msgid "Edit Cycling"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2833
 msgid "Dog Racing"
 msgstr "Koerte võidujooks"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2834
 msgid "Edit Dog Racing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2839
 msgid "Equestrian"
 msgstr "Ratsasport"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2840
 msgid "Edit Equestrian"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2845
 msgid "Horse Racing"
 msgstr "Traavivõistlused"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2846
 msgid "Edit Horse Racing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2851
 msgid "Gymnastics"
 msgstr "Võimlemine"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2852
 msgid "Edit Gymnastics"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2857
 msgid "Skating"
 msgstr "Uisutamine"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2858
 msgid "Edit Skating"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2863
 msgid "Skateboard"
 msgstr "Rulasõit"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2864
 msgid "Edit Skateboard"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2869
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2870
 msgid "Edit Swimming"
 msgstr "Lisa andmeid"
@@ -28308,60 +28985,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2877
 msgid "Edit Skiing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "Piste type"
 msgstr "Nõlva liik"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "downhill"
 msgstr "mägi"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "nordic"
 msgstr "murdmaa"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "snow_park"
 msgstr "lumepark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "novice"
 msgstr "algaja"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "easy"
 msgstr "kerge"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "advanced"
 msgstr "edasijõudnu"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "expert"
 msgstr "ekspert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "freeride"
 msgstr "vabalaskumine"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2884
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -28369,105 +29046,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2886
 msgid "Edit Shooting"
 msgstr "Lisa andmeid"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2892
 msgid "Sport (Ball)"
 msgstr "Sport (pallimängud)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2893
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2894
 msgid "Edit Soccer"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2899
 msgid "Australian Football"
 msgstr "Austraalia jalgpall"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2900
 msgid "Edit Australian Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2905
 msgid "American Football"
 msgstr "Ameerika jalgpall"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2906
 msgid "Edit American Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2911
 msgid "Canadian Football"
 msgstr "Kanada jalgpall"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2912
 msgid "Edit Canadian Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2917
 msgid "Gaelic Football"
 msgstr "Keldi jalgpall"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2918
 msgid "Edit Gaelic Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2923
 msgid "Rugby League"
 msgstr "Rägbiliiga"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2924
 msgid "Edit Rugby League"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2929
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2930
 msgid "Edit Rugby Union"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2935
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2936
 msgid "Edit Baseball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2941
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2942
 msgid "Edit Basketball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2947
 msgid "Volleyball"
 msgstr "Võrkpall"
@@ -28475,10 +29152,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2949
 msgid "Edit Volleyball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2956
 msgid "Beachvolleyball"
 msgstr "Rannavõrkpall"
@@ -28486,120 +29163,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2958
 msgid "Edit Beachvolleyball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2965
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2966
 msgid "Edit Golf"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2969
 msgid "golf_course"
 msgstr "Golfiväljak"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2971
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2972
 msgid "Edit Boule"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2977
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2978
 msgid "Edit Bowls"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2983
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2984
 msgid "Edit Cricket"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2989
 msgid "Cricket Nets"
 msgstr "Kriketivõrgud"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2990
 msgid "Edit Cricket Nets"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2995
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2996
 msgid "Edit Croquet"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:3001
 msgid "Hockey"
 msgstr "Hoki"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:3002
 msgid "Edit Hockey"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:3007
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:3008
 msgid "Edit Pelota"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:3013
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:3014
 msgid "Edit Racquet"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:3019
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:3020
 msgid "Edit Table Tennis"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:3025
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:3026
 msgid "Edit Tennis"
 msgstr "Lisa andmeid"
@@ -28607,40 +29284,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2887 build/trans_presets.java:2888
+#: build/trans_presets.java:3032 build/trans_presets.java:3033
 msgid "Motorsport"
 msgstr "Mootorisport"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3034
 msgid "Edit Motorsport"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3039
 msgid "Karting"
 msgstr "Kardisõit"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:3040
 msgid "Edit Karting"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:3045
 msgid "Motocross"
 msgstr "Motokross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:3046
 msgid "Edit Motocross"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:3051
 msgid "Safety Training"
 msgstr "Turvalise sõidu koolitus"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:3052
 msgid "Edit Safety Training"
 msgstr "Lisa andmeid"
@@ -28648,20 +29325,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:3058
 msgid "Model Aerodrome"
 msgstr "Mudelite lennuväli"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:3059
 msgid "Edit Model Aerodrome"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:3064
 msgid "RC Car"
 msgstr "Kaugjuhitav auto"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3065
 msgid "Edit RC Car"
 msgstr "Lisa andmeid"
@@ -28669,10 +29346,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:2927 build/trans_presets.java:2928
+#: build/trans_presets.java:3072 build/trans_presets.java:3073
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3074
 msgid "Building"
 msgstr "Hoone"
@@ -28680,25 +29357,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3077
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:3078
 msgid "Edit Tower"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "Tower type"
 msgstr "Torni liik"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "communication"
 msgstr "side"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "observation"
 msgstr "vaatlus"
@@ -28707,5 +29384,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:2938 build/trans_presets.java:2959
+#: build/trans_presets.java:3083 build/trans_presets.java:3104
 msgid "Height (meters)"
 msgstr "Kõrgus (meetrites)"
@@ -28713,5 +29390,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3087
 msgid "Flagpole"
 msgstr "Lipuvarras"
@@ -28721,15 +29398,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:3092
 msgid "Works"
 msgstr "Tööstushoone"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:3093
 msgid "Edit Works"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3097
 msgid "Chimney"
 msgstr "Korsten"
@@ -28737,10 +29414,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:3099
 msgid "Edit Chimney"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:3106
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -28748,20 +29425,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3108
 msgid "Edit Windmill"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3112
 msgid "Gasometer"
 msgstr "Gaasimõõtejaam"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3113
 msgid "Edit Gasometer"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:3117
 msgid "Pipeline"
 msgstr "Torustik"
@@ -28770,5 +29447,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:3120
 msgid "Edit Pipeline"
 msgstr "Lisa andmeid"
@@ -28812,5 +29489,5 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:2978 build/trans_style.java:817
+#: build/trans_presets.java:3123 build/trans_style.java:817
 #: build/trans_style.java:830 build/trans_style.java:842
 #: build/trans_style.java:847 build/trans_style.java:2936
@@ -28823,10 +29500,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2978 build/trans_presets.java:3104
+#: build/trans_presets.java:3123 build/trans_presets.java:3250
 msgid "gas"
 msgstr "gaas"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:3123
 msgid "heat"
 msgstr "soojus"
@@ -28834,20 +29511,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2978 build/trans_presets.java:3104
+#: build/trans_presets.java:3123 build/trans_presets.java:3250
 msgid "oil"
 msgstr "õli"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:3123
 msgid "sewage"
 msgstr "kanalisatsioon"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgid "Location"
 msgstr "Asukoht"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "underwater"
@@ -28855,5 +29532,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "overground"
@@ -28861,5 +29538,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:3126
 msgid "Crane"
 msgstr "Kraana"
@@ -28867,10 +29544,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3128
 msgid "Edit Crane"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3132
 msgid "Mineshaft"
 msgstr "Kaevanduskäik"
@@ -28879,25 +29556,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3135
 msgid "Edit Mineshaft"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "Function"
 msgstr "Funktsioon"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "winding"
 msgstr "vintsimine"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "air"
 msgstr "õhk"
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3139
 msgid "Depth in meters"
 msgstr "Sügavus meetrites"
@@ -28905,5 +29582,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "Resource"
 msgstr "Loodusvara"
@@ -28911,5 +29588,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "aggregate"
 msgstr "killustik"
@@ -28917,5 +29594,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "bauxite"
 msgstr "boksiit"
@@ -28924,6 +29601,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3250
 msgid "coal"
 msgstr "süsi"
@@ -28931,5 +29608,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "copper"
 msgstr "vask"
@@ -28937,5 +29614,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "dimension_stone"
 msgstr "tükk-kivi"
@@ -28943,5 +29620,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "gold"
 msgstr "kuld"
@@ -28949,5 +29626,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "ilmenite"
 msgstr "ilmeniit"
@@ -28955,5 +29632,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "iron_ore"
 msgstr "rauamaak"
@@ -28961,5 +29638,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "lead"
 msgstr "plii"
@@ -28967,5 +29644,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "limestone"
 msgstr "lubjakivi"
@@ -28973,5 +29650,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "nickel"
 msgstr "nikkel"
@@ -28979,5 +29656,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "rutile"
 msgstr "rutiil"
@@ -28985,5 +29662,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "salt"
 msgstr "sool"
@@ -28991,5 +29668,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "silver"
 msgstr "hõbe"
@@ -28997,5 +29674,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "tin"
 msgstr "tina"
@@ -29003,5 +29680,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "zinc"
 msgstr "tsink"
@@ -29009,10 +29686,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "zircon"
 msgstr "tsirkoon"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3142
 msgid "Visible Headframe"
 msgstr "Nähtav šahti väljaehitus"
@@ -29020,10 +29697,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
+#: build/trans_presets.java:3143 build/trans_presets.java:3153
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3145
 msgid "Adit"
 msgstr "stoll"
@@ -29031,10 +29708,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3147
 msgid "Edit Adit"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3150
 msgid "Length in meters"
 msgstr "Pikkus meetrites"
@@ -29042,15 +29719,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3156
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3157
 msgid "Edit Water Tower"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3161
 msgid "Water Works"
 msgstr "Veepuhastusjaam"
@@ -29058,10 +29735,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3163
 msgid "Edit Water Works"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3169
 msgid "Wastewater Plant"
 msgstr "Reoveepuhastusjaam"
@@ -29071,10 +29748,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3173
 msgid "Edit Wastewater Plant"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3177
 msgid "Watermill"
 msgstr "Vesiveski"
@@ -29082,10 +29759,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3179
 msgid "Edit Watermill"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3184
 msgid "Fountain"
 msgstr "Purskaev"
@@ -29094,10 +29771,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3187
 msgid "Edit Fountain"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3191
 msgid "Water Well"
 msgstr "Veekaev"
@@ -29105,5 +29782,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3193
 msgid "Edit Water Well"
 msgstr "Lisa andmeid"
@@ -29111,5 +29788,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3198
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -29117,5 +29794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3200
 msgid "Edit Lighthouse"
 msgstr "Lisa andmeid"
@@ -29123,10 +29800,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3206
 msgid "Edit Beacon"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3210
 msgid "Street Lamp"
 msgstr "Tänavavalgusti"
@@ -29134,5 +29811,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3212
 msgid "Edit Street Lamp"
 msgstr "Lisa andmeid"
@@ -29141,15 +29818,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3215
 msgid "Operation times"
 msgstr "Töötamise aeg"
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3215
 msgid "Mo-Fr 22:00-05:00"
 msgstr "E-R 22:00-05:00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3217
 msgid "Measurement Station"
 msgstr "Mõõtejaam"
@@ -29157,55 +29834,62 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3219
 msgid "Edit Measurement Station"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "Measurement"
 msgstr "Mõõtmine"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "particulate_matter"
 msgstr "puisteaine"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "seismic"
 msgstr "seismoloogia"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "water_level"
 msgstr "veetase"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "weather"
 msgstr "ilm"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "Recording"
 msgstr "Salvestamine"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "manually"
 msgstr "käsitsi"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "automated"
 msgstr "automatiseeritud"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "remote"
 msgstr "kaugjuhitav"
 
+#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
+#: build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
+msgid "no"
+msgstr "Info"
+
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3228
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -29213,10 +29897,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3230
 msgid "Edit Survey Point"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3234
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -29224,30 +29908,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3236
 msgid "Edit Surveillance Camera"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "indoor"
 msgstr "ruumides"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "outdoor"
 msgstr "väljas"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "public"
 msgstr "avalik"
 
 #. group "Power"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3242
 msgid "Power"
 msgstr "Elektrivõrk"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3243
 msgid "Power Generator"
 msgstr "Elektrigeneraator"
@@ -29257,100 +29941,272 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3247
 msgid "Edit Power Generator"
 msgstr "Lisa andmeid"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3250
+msgid "biofuel"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "biogas"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "biomass"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "diesel"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "gasoline"
+msgstr "Rannik"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "geothermal"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "hydro"
+msgstr "hüdro"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "nuclear"
+msgstr "tuuma"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "osmotic"
+msgstr "Erootikakaubad"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "solar"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "tidal"
+msgstr "padumeri"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "waste"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "wave"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
 msgid "wind"
 msgstr "tuul"
 
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "hydro"
-msgstr "hüdro"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "solar"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "nuclear"
-msgstr "tuuma"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "fossil"
-msgstr "fosiil"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biofuel"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "waste"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biomass"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "geothermal"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biogas"
-msgstr ""
-
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
+msgid "anaerobic_digestion"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "combustion"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "dam"
+msgstr "Tamm"
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "fission"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "fusion"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "gasification"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "combustion"
+#: build/trans_presets.java:3251
+msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "fission"
-msgstr ""
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "pumping"
+msgstr "Matkamine"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
+msgid "pyrolysis"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "run-of-the-river"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
 msgid "thermal"
 msgstr ""
 
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "gasification"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "wind_turbine"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "anaerobic_digestion"
+#. <space />
+#. item "Power/Power Generator" label "Output forms of energy"
+#: build/trans_presets.java:3253
+msgid "Output forms of energy"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity"
+#: build/trans_presets.java:3254
+#, fuzzy
+msgid "electricity"
+msgstr "elekter"
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "2 W"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "3 kW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "5 MW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "7 GW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "hot water"
+#: build/trans_presets.java:3255
+#, fuzzy
+msgid "hot water"
+msgstr "vesi"
+
+#. item "Power/Power Generator" combo "hot air"
+#: build/trans_presets.java:3256
+msgid "hot air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "cold water"
+#: build/trans_presets.java:3257
+#, fuzzy
+msgid "cold water"
+msgstr "Lisa andmeid"
+
+#. item "Power/Power Generator" combo "cold air"
+#: build/trans_presets.java:3258
+msgid "cold air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "compressed air"
+#: build/trans_presets.java:3259
+msgid "compressed air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "steam"
+#: build/trans_presets.java:3260
+msgid "steam"
+msgstr ""
+
+#. item "Power/Power Generator" combo "vacuum"
+#: build/trans_presets.java:3261
+msgid "vacuum"
+msgstr ""
+
+#. item "Power/Power Generator" combo "battery charging"
+#: build/trans_presets.java:3262
+msgid "battery charging"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3264
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -29359,10 +30215,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3267
 msgid "Edit Power Station"
 msgstr "Lisa andmeid"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3273
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -29371,5 +30227,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3276
 msgid "Edit Power Sub Station"
 msgstr "Lisa andmeid"
@@ -29377,10 +30233,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3123 build/trans_presets.java:3156
+#: build/trans_presets.java:3279 build/trans_presets.java:3312
 msgid "Line reference"
 msgstr "Elektriliini number"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3281
 msgid "Cable Distribution Cabinet"
 msgstr "Jaotuskilp"
@@ -29389,5 +30245,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3284
 msgid "Edit Cable Distribution Cabinet"
 msgstr "Lisa andmeid"
@@ -29395,5 +30251,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3290
 msgid "Power Tower"
 msgstr "Elektriliini mast"
@@ -29404,5 +30260,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3295
 msgid "Edit Power Tower"
 msgstr "Lisa andmeid"
@@ -29410,10 +30266,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3297
 msgid "Tower reference"
 msgstr "Masti number"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3299
 msgid "Pole"
 msgstr "Elektripost"
@@ -29422,5 +30278,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3302
 msgid "Edit Power Pole"
 msgstr "Lisa andmeid"
@@ -29428,10 +30284,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3304
 msgid "Pole reference"
 msgstr "Posti tähis"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3306
 msgid "Power Line"
 msgstr "Elektriliin"
@@ -29440,15 +30296,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3309
 msgid "Edit Power Line"
 msgstr "Lisa andmeid"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgctxt "Power Line"
 msgid "line"
@@ -29456,5 +30312,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29462,40 +30318,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3315
 msgid "Amount of Cables"
 msgstr "Juhtmete arv"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "single"
 msgstr "üksik"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "double"
 msgstr "topelt"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "triple"
 msgstr "kolmekordne"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3319
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3320
 msgid "Castle"
 msgstr "Loss"
@@ -29504,20 +30360,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3323
 msgid "Edit Castle"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3328
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3329
 msgid "Edit Ruins"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3334
 msgid "Archaeological Site"
 msgstr "Arheoloogiamälestis"
@@ -29526,10 +30382,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3337
 msgid "Edit Archaeological Site"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3342
 msgid "Battlefield"
 msgstr "Lahingupaik"
@@ -29537,10 +30393,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3344
 msgid "Edit Battlefield"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3348
 msgid "Palaeontological Site"
 msgstr "Paleontoloogiamälestis"
@@ -29548,5 +30404,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3350
 msgid "Edit Palaeontological Site"
 msgstr "Lisa andmeid"
@@ -29554,15 +30410,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3355
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3356
 msgid "Edit Monument"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3360
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -29570,60 +30426,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3362
 msgid "Edit Memorial"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3366
 msgid "Wayside Cross"
 msgstr "Teeäärne rist"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3367
 msgid "Edit Wayside Cross"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3371
 msgid "Wayside Shrine"
 msgstr "Teeäärne altar"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3372
 msgid "Edit Wayside Shrine"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3220
+#: build/trans_presets.java:3376
 msgid "Boundary Stone"
 msgstr "Piirikivi"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3377
 msgid "Edit Boundary Stone"
 msgstr "Lisa andmeid"
 
 #. group "Shops"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3383
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3384
 msgid "Food"
 msgstr "Söök"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3385
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3386
 msgid "Edit Supermarket"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3391
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -29631,10 +30487,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3393
 msgid "Edit Convenience Store"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3398
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -29642,5 +30498,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3400
 msgid "Edit Kiosk"
 msgstr "Lisa andmeid"
@@ -29648,5 +30504,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3406
 msgid "Baker"
 msgstr "Pagar"
@@ -29654,10 +30510,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3408
 msgid "Edit Baker"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3413
 msgid "Butcher"
 msgstr "Lihunik"
@@ -29665,10 +30521,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3415
 msgid "Edit Butcher"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3420
 msgid "Seafood"
 msgstr "Mereannid"
@@ -29676,10 +30532,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3422
 msgid "Edit Seafood"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3429
 msgid "Deli (Fine Food)"
 msgstr "Delikatessid"
@@ -29687,10 +30543,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3431
 msgid "Edit Deli (Fine Food)"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3438
 msgid "Confectionery"
 msgstr "Maiustused"
@@ -29698,5 +30554,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3440
 msgid "Edit Confectionery"
 msgstr "Lisa andmeid"
@@ -29704,5 +30560,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3446
 msgid "Marketplace"
 msgstr "Turg"
@@ -29710,10 +30566,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3448
 msgid "Edit Marketplace"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3455
 msgid "Greengrocer"
 msgstr "Aedviljad"
@@ -29721,15 +30577,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3301
+#: build/trans_presets.java:3457
 msgid "Edit Greengrocer"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3308
+#: build/trans_presets.java:3464
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3465
 msgid "Edit Organic Shop"
 msgstr "Lisa andmeid"
@@ -29737,5 +30593,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3471
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -29743,25 +30599,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:3473
 msgid "Edit Alcohol Shop"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:3478
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3479
 msgid "Edit Beverages Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3331
+#: build/trans_presets.java:3487
 msgid "Edit Clothes Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3336
+#: build/trans_presets.java:3492
 msgid "Boutique"
 msgstr ""
@@ -29769,20 +30625,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3338
+#: build/trans_presets.java:3494
 msgid "Edit Boutique"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3345
+#: build/trans_presets.java:3501
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3502
 msgid "Edit Shoe Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3351
+#: build/trans_presets.java:3507
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -29790,10 +30646,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3509
 msgid "Edit Outdoor Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3359
+#: build/trans_presets.java:3515
 msgid "Edit Sports Shop"
 msgstr "Lisa andmeid"
@@ -29801,5 +30657,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3365
+#: build/trans_presets.java:3521
 msgid "Dry Cleaning"
 msgstr "Keemiline puhastus"
@@ -29807,10 +30663,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3523
 msgid "Edit Dry Cleaning"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3528
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -29818,20 +30674,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3374
+#: build/trans_presets.java:3530
 msgid "Edit Laundry"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3535
 msgid "Tailor"
 msgstr "Õmblustöökoda"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3536
 msgid "Edit Tailor"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3541
 msgid "Fabric"
 msgstr "Kangad"
@@ -29839,35 +30695,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3387
+#: build/trans_presets.java:3543
 msgid "Edit Fabric"
 msgstr "Lisa andmeid"
 
 #. group "Electronic"
-#: build/trans_presets.java:3395
+#: build/trans_presets.java:3551
 msgid "Electronic"
 msgstr "Elektroonika"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3552
 msgid "Computer"
 msgstr "Arvutid"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3553
 msgid "Edit Computer Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3402
+#: build/trans_presets.java:3558
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3403
+#: build/trans_presets.java:3559
 msgid "Edit Electronics Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3564
 msgid "Mobile Phone"
 msgstr "Mobiiltelefonid"
@@ -29875,10 +30731,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3410
+#: build/trans_presets.java:3566
 msgid "Edit Mobile Phone"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3573
 msgid "Vacuum Cleaner"
 msgstr "Tolmuimejad"
@@ -29886,35 +30742,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3575
 msgid "Edit Vacuum Cleaner"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3582
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3427
+#: build/trans_presets.java:3583
 msgid "Edit Hifi Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3432
+#: build/trans_presets.java:3588
 msgid "Video"
 msgstr "Video"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3589
 msgid "Edit Video Shop"
 msgstr "Lisa andmeid"
 
 #. group "Cash"
-#: build/trans_presets.java:3439
+#: build/trans_presets.java:3595
 msgid "Cash"
 msgstr "Sularaha"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3596
 msgid "Bank"
 msgstr "Pank"
@@ -29922,5 +30778,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3598
 msgid "Edit Bank"
 msgstr "Lisa andmeid"
@@ -29928,10 +30784,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3447 build/trans_presets.java:3456
+#: build/trans_presets.java:3603 build/trans_presets.java:3612
 msgid "Automated Teller Machine"
 msgstr "Sularahaautomaat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3605
 msgid "Money Exchange"
 msgstr "Rahavahetus"
@@ -29939,5 +30795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3607
 msgid "Edit Money Exchange"
 msgstr "Lisa andmeid"
@@ -29945,10 +30801,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3614
 msgid "Edit Automated Teller Machine"
 msgstr "Lisa andmeid"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3620
 msgid "Department Store"
 msgstr "Kaubamaja"
@@ -29956,10 +30812,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3466
+#: build/trans_presets.java:3622
 msgid "Edit Department Store"
 msgstr "Lisa andmeid"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3629
 msgid "Mall"
 msgstr "Kaubanduskeskus"
@@ -29967,5 +30823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3475
+#: build/trans_presets.java:3631
 msgid "Edit Mall"
 msgstr "Lisa andmeid"
@@ -29973,35 +30829,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3483
+#: build/trans_presets.java:3639
 msgid "Chemist"
 msgstr "Apteek"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3640
 msgid "Edit Chemist"
 msgstr "Lisa andmeid"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3489
+#: build/trans_presets.java:3645
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3490
+#: build/trans_presets.java:3646
 msgid "Edit Hairdresser"
 msgstr "Lisa andmeid"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3495
+#: build/trans_presets.java:3651
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3496
+#: build/trans_presets.java:3652
 msgid "Edit Optician"
 msgstr "Lisa andmeid"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3657
 msgid "Jewelry"
 msgstr "Juveelipood"
@@ -30009,10 +30865,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3503
+#: build/trans_presets.java:3659
 msgid "Edit Jewelry"
 msgstr "Lisa andmeid"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3510
+#: build/trans_presets.java:3666
 msgid "Erotic"
 msgstr "Erootikakaubad"
@@ -30020,5 +30876,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3668
 msgid "Edit Erotic"
 msgstr "Lisa andmeid"
@@ -30026,5 +30882,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3676
 msgid "Florist"
 msgstr "Lilled"
@@ -30032,10 +30888,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:3678
 msgid "Edit Florist"
 msgstr "Lisa andmeid"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3527
+#: build/trans_presets.java:3683
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -30043,5 +30899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3529
+#: build/trans_presets.java:3685
 msgid "Edit Garden Centre"
 msgstr "Lisa andmeid"
@@ -30049,5 +30905,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3691
 msgid "Do-it-yourself-store"
 msgstr "Pood isetegijaile"
@@ -30055,10 +30911,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3537
+#: build/trans_presets.java:3693
 msgid "Edit Do-it-yourself-store"
 msgstr "Lisa andmeid"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3542
+#: build/trans_presets.java:3698
 msgid "Hardware"
 msgstr "Ehituspood"
@@ -30066,10 +30922,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3544
+#: build/trans_presets.java:3700
 msgid "Edit Hardware Store"
 msgstr "Lisa andmeid"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3705
 msgid "Paint"
 msgstr "Värvid"
@@ -30077,5 +30933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3707
 msgid "Edit Paint"
 msgstr "Lisa andmeid"
@@ -30083,15 +30939,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3715
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:3716
 msgid "Edit Furniture Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3721
 msgid "Kitchen"
 msgstr "Valmisköögid"
@@ -30099,10 +30955,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3567
+#: build/trans_presets.java:3723
 msgid "Edit Kitchen"
 msgstr "Lisa andmeid"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3574
+#: build/trans_presets.java:3730
 msgid "Curtain"
 msgstr "Kardinad"
@@ -30110,10 +30966,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3576
+#: build/trans_presets.java:3732
 msgid "Edit Curtain"
 msgstr "Lisa andmeid"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3739
 msgid "Frame"
 msgstr "Raamimiskoda"
@@ -30121,5 +30977,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:3741
 msgid "Edit Frames"
 msgstr "Lisa andmeid"
@@ -30127,15 +30983,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:3749
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3750
 msgid "Edit Stationery Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3755
 msgid "Copyshop"
 msgstr "Paljunduskoda"
@@ -30143,15 +30999,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3757
 msgid "Edit Copyshop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3764
 msgid "Book Store"
 msgstr "Raamatupood"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3765
 msgid "Edit Book Store"
 msgstr "Lisa andmeid"
@@ -30159,15 +31015,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3615
+#: build/trans_presets.java:3771
 msgid "Travel Agency"
 msgstr "Reisibüroo"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3616
+#: build/trans_presets.java:3772
 msgid "Edit Travel Agency"
 msgstr "Lisa andmeid"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3621
+#: build/trans_presets.java:3777
 msgid "Musical Instrument"
 msgstr "Muusikariistad"
@@ -30175,20 +31031,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3623
+#: build/trans_presets.java:3779
 msgid "Edit Musical Instruments"
 msgstr "Lisa andmeid"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3630
+#: build/trans_presets.java:3786
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3787
 msgid "Edit Toy Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3636
+#: build/trans_presets.java:3792
 msgid "Variety Store"
 msgstr ""
@@ -30196,10 +31052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3794
 msgid "Edit Variety Store"
 msgstr "Lisa andmeid"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3802
 msgid "Vending machine"
 msgstr "Müügiautomaat"
@@ -30207,5 +31063,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:3804
 msgid "Edit Vending machine"
 msgstr "Lisa andmeid"
@@ -30213,180 +31069,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "Vending products"
 msgstr "Müüdavad kaubad"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "food"
 msgstr "toit"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "drinks"
 msgstr "joogid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "sweets"
 msgstr "maiustused"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "cigarettes"
 msgstr "suitsud"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "photos"
 msgstr "fotod"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "animal_food"
 msgstr "looma_toit"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "news_papers"
 msgstr "ajalehed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "toys"
 msgstr "mänguasjad"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "stamps"
 msgstr "templid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "vouchers"
 msgstr "maksedokumendid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "bicycle_tube"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "condoms"
 msgstr "kondoomid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "tampons"
 msgstr "tampoonid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "excrement_bags"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3662 build/trans_presets.java:3779
+#: build/trans_presets.java:3818 build/trans_presets.java:3942
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3663
+#: build/trans_presets.java:3819
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3820
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3821
 msgid "Edit National Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3826
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3671
+#: build/trans_presets.java:3827
 msgid "Edit Administrative Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3832
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3677
+#: build/trans_presets.java:3833
 msgid "Edit Civil Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3682
+#: build/trans_presets.java:3838
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3839
 msgid "Edit Political Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3688
+#: build/trans_presets.java:3844
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3845
 msgid "Edit National Park Boundary"
 msgstr "Lisa andmeid"
 
 #. group "Places"
-#: build/trans_presets.java:3695
+#: build/trans_presets.java:3851
 msgid "Places"
 msgstr "Asukohad"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3697
+#: build/trans_presets.java:3853
 msgid "Edit Continent"
 msgstr "Lisa andmeid"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3703
+#: build/trans_presets.java:3859
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -30394,10 +31250,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3860
 msgid "Edit Country"
 msgstr "Lisa andmeid"
 
 #. item "Places/State"
-#: build/trans_presets.java:3710
+#: build/trans_presets.java:3866
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -30405,25 +31261,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3867
 msgid "Edit State"
 msgstr "Lisa andmeid"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3717
+#: build/trans_presets.java:3873
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3874
 msgid "Edit Region"
 msgstr "Lisa andmeid"
 
 #. item "Places/County"
-#: build/trans_presets.java:3724
+#: build/trans_presets.java:3880
 msgid "County"
 msgstr "Maakond"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3725
+#: build/trans_presets.java:3881
 msgid "Edit County"
 msgstr "Lisa andmeid"
@@ -30431,5 +31287,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3888
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -30438,10 +31294,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3733
+#: build/trans_presets.java:3889
 msgid "Edit City"
 msgstr "Lisa andmeid"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3895
 msgid "Town"
 msgstr "Linn"
@@ -30449,10 +31305,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3897
 msgid "Edit Town"
 msgstr "Lisa andmeid"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3747
+#: build/trans_presets.java:3903
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -30460,31 +31316,42 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3905
 msgid "Edit Suburb"
 msgstr "Lisa andmeid"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3911
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3756
+#: build/trans_presets.java:3912
 msgid "Edit Village"
 msgstr "Lisa andmeid"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3918
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3919
 msgid "Edit Hamlet"
 msgstr "Lisa andmeid"
 
+#. item "Places/Isolated Dwelling"
+#: build/trans_presets.java:3925
+msgid "Isolated Dwelling"
+msgstr ""
+
+#. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
+#: build/trans_presets.java:3926
+#, fuzzy
+msgid "Edit Isolated Dwelling"
+msgstr "Lisa andmeid"
+
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:3933
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -30492,10 +31359,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3935
 msgid "Edit Locality"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3780
+#: build/trans_presets.java:3943
 msgid "Peak"
 msgstr "Mäetipp"
@@ -30503,10 +31370,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3782
+#: build/trans_presets.java:3945
 msgid "Edit Peak"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3788
+#: build/trans_presets.java:3951
 msgid "Glacier"
 msgstr "Liustik"
@@ -30514,10 +31381,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3953
 msgid "Edit Glacier"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3796
+#: build/trans_presets.java:3959
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -30525,10 +31392,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3798
+#: build/trans_presets.java:3961
 msgid "Edit Volcano"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3967
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -30536,5 +31403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3969
 msgid "Edit Cave Entrance"
 msgstr "Lisa andmeid"
@@ -30542,5 +31409,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:3975
 msgid "Island"
 msgstr "Saar"
@@ -30548,10 +31415,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:3977
 msgid "Edit Island"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3983
 msgid "Islet"
 msgstr "Laid"
@@ -30559,15 +31426,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3822
+#: build/trans_presets.java:3985
 msgid "Edit Islet"
 msgstr "Lisa andmeid"
 
 #. group "Nature"
-#: build/trans_presets.java:3829
+#: build/trans_presets.java:3992
 msgid "Nature"
 msgstr "Loodus"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3830
+#: build/trans_presets.java:3993
 msgid "Tree"
 msgstr "Üksik puu"
@@ -30576,15 +31443,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3996
 msgid "Edit Tree"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:4001
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:4003
 msgid "Wood"
 msgstr "Mets"
@@ -30593,10 +31460,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3843
+#: build/trans_presets.java:4006
 msgid "Edit Wood"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "coniferous"
@@ -30604,5 +31471,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "deciduous"
@@ -30610,5 +31477,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "mixed"
@@ -30616,5 +31483,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3848
+#: build/trans_presets.java:4011
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -30623,30 +31490,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:4014
 msgid "Edit Forest Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "coniferous"
 msgstr "okasmets"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "deciduous"
 msgstr "lehtmets"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "mixed"
 msgstr "segamets"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:4020
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:4021
 msgid "Edit Nature Reserve"
 msgstr "Lisa andmeid"
@@ -30654,15 +31521,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3863
+#: build/trans_presets.java:4026
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:4027
 msgid "Edit Scree"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3868
+#: build/trans_presets.java:4031
 msgid "Fell"
 msgstr "Langus"
@@ -30670,20 +31537,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3870
+#: build/trans_presets.java:4033
 msgid "Edit Fell"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:4037
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3875
+#: build/trans_presets.java:4038
 msgid "Edit Scrub"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:4042
 msgid "Heath"
 msgstr "Nõmm"
@@ -30691,15 +31558,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:4044
 msgid "Edit Heath"
 msgstr "Lisa andmeid"
 
 #. group "Land use"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:4049
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:4050
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -30708,40 +31575,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3890
+#: build/trans_presets.java:4053
 msgid "Edit Farmyard Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:4058
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3896
+#: build/trans_presets.java:4059
 msgid "Edit Farmland Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3901
+#: build/trans_presets.java:4064
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:4065
 msgid "Edit Meadow Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3907
+#: build/trans_presets.java:4070
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:4071
 msgid "Edit Vineyard Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:3913
+#: build/trans_presets.java:4076
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -30749,15 +31616,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:3915
+#: build/trans_presets.java:4078
 msgid "Edit Greenhouse Horticulture"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4084
 msgid "Allotments"
 msgstr "Aiamaa"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:4085
 msgid "Edit Allotments Landuse"
 msgstr "Lisa andmeid"
@@ -30765,25 +31632,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3928
+#: build/trans_presets.java:4091
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3929
+#: build/trans_presets.java:4092
 msgid "Edit Garden"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:4096
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3934
+#: build/trans_presets.java:4097
 msgid "Edit Grass Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:4102
 msgid "Village Green"
 msgstr "Külatanum"
@@ -30791,10 +31658,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:3941
+#: build/trans_presets.java:4104
 msgid "Edit Village Green Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:4109
 msgid "Common"
 msgstr "Avalik maa"
@@ -30802,20 +31669,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3948
+#: build/trans_presets.java:4111
 msgid "Edit Common"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3952
+#: build/trans_presets.java:4115
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:4116
 msgid "Edit Park"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3957
+#: build/trans_presets.java:4120
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -30823,5 +31690,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:4122
 msgid "Edit Recreation Ground Landuse"
 msgstr "Lisa andmeid"
@@ -30829,15 +31696,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3965
+#: build/trans_presets.java:4128
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:4129
 msgid "Edit Residential Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3971
+#: build/trans_presets.java:4134
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -30845,10 +31712,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3973
+#: build/trans_presets.java:4136
 msgid "Edit Graveyard"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3979
+#: build/trans_presets.java:4142
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -30856,40 +31723,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3981
+#: build/trans_presets.java:4144
 msgid "Edit Cemetery Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:4151
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3989
+#: build/trans_presets.java:4152
 msgid "Edit Retail Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3994
+#: build/trans_presets.java:4157
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3995
+#: build/trans_presets.java:4158
 msgid "Edit Commercial Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4000
+#: build/trans_presets.java:4163
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4164
 msgid "Edit Industrial Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4169
 msgid "Garages"
 msgstr "Garaažid"
@@ -30897,10 +31764,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4008
+#: build/trans_presets.java:4171
 msgid "Edit Garages"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4177
 msgid "Railway land"
 msgstr "Raudtee"
@@ -30908,15 +31775,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4179
 msgid "Edit Railway Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4184
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4185
 msgid "Edit Military Landuse"
 msgstr "Lisa andmeid"
@@ -30924,55 +31791,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4028
+#: build/trans_presets.java:4191
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4029
+#: build/trans_presets.java:4192
 msgid "Edit Construction Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4197
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4035
+#: build/trans_presets.java:4198
 msgid "Edit Brownfield Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4203
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4041
+#: build/trans_presets.java:4204
 msgid "Edit Greenfield Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4046
+#: build/trans_presets.java:4209
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4047
+#: build/trans_presets.java:4210
 msgid "Edit Landfill Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4052
+#: build/trans_presets.java:4215
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4216
 msgid "Edit Quarry Landuse"
 msgstr "Lisa andmeid"
 
 #. group "Annotation"
-#: build/trans_presets.java:4060
+#: build/trans_presets.java:4223
 msgid "Annotation"
 msgstr ""
@@ -30980,5 +31847,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4061
+#: build/trans_presets.java:4224
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -30989,5 +31856,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4227
 msgid "Edit Address Information"
 msgstr "Lisa andmeid"
@@ -30995,5 +31862,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:4229
 msgid "House number"
 msgstr "Maja number"
@@ -31001,5 +31868,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4068
+#: build/trans_presets.java:4231
 msgid "House name"
 msgstr "Maja nimi"
@@ -31008,55 +31875,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4069 build/trans_presets.java:4186
+#: build/trans_presets.java:4232 build/trans_presets.java:4386
 msgid "Street name"
 msgstr "Tänava nimi"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4233
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4234
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "Country code"
 msgstr "Riigi kood"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "AT"
 msgstr "AT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "CH"
 msgstr "CH"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "DE"
 msgstr "DE"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "FR"
 msgstr "FR"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "GB"
 msgstr "GB"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "IT"
 msgstr "IT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "US"
 msgstr "US"
@@ -31064,5 +31931,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4075
+#: build/trans_presets.java:4238
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -31074,5 +31941,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4241
 msgid "Edit Address Interpolation"
 msgstr "Lisa andmeid"
@@ -31080,35 +31947,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "Numbering scheme"
 msgstr "Nummerdussüsteem"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "odd"
 msgstr "paaritu"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "even"
 msgstr "paaris"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "alphabetic"
 msgstr "tähestikuline"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4082
+#: build/trans_presets.java:4245
 msgid "Contact"
 msgstr "Kontakt"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4246
 msgid "Edit Contact information"
 msgstr "Lisa andmeid"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4255
 msgid "Image"
 msgstr "Pilt"
@@ -31118,5 +31985,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4100
+#: build/trans_presets.java:4263
 msgid "Edit Multipolygon"
 msgstr "Lisa andmeid"
@@ -31128,5 +31995,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4106 build/trans_presets.java:4123
+#: build/trans_presets.java:4269 build/trans_presets.java:4286
 msgid "outer segment"
 msgstr "väline osa"
@@ -31134,5 +32001,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4107 build/trans_presets.java:4124
+#: build/trans_presets.java:4270 build/trans_presets.java:4287
 msgid "inner segment"
 msgstr "siseosa"
@@ -31140,5 +32007,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4273
 msgid "Boundary"
 msgstr "Piir"
@@ -31149,5 +32016,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4278
 msgid "Edit Boundary"
 msgstr "Lisa andmeid"
@@ -31155,40 +32022,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "Boundary type"
 msgstr "Piiri tüüp"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "administrative"
 msgstr "haldusüksus"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "national"
 msgstr "rahvuslik"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "civil"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "political"
 msgstr "poliitiline"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4283
 msgid "Administrative level"
 msgstr "Haldusüksuse tase"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4125
+#: build/trans_presets.java:4288
 msgid "Sub area"
 msgstr "Alamala"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4126
+#: build/trans_presets.java:4289
 msgid "Administration centre"
 msgstr "Haldusüksuse keskus"
@@ -31196,5 +32063,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4292
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -31203,5 +32070,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4132
+#: build/trans_presets.java:4295
 msgid "Edit Turn Restriction"
 msgstr "Lisa andmeid"
@@ -31209,40 +32076,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -31251,15 +32118,16 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4139
+#: build/trans_presets.java:4302
 msgid "from way"
 msgstr "teelt"
 
-#. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:4140
-msgid "via node or way"
+#. item "Relations/Turn restriction" role "via node or ways"
+#: build/trans_presets.java:4303
+#, fuzzy
+msgid "via node or ways"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4304
 msgid "to way"
 msgstr "teele"
@@ -31267,12 +32135,17 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4307
 msgid "Route"
 msgstr "Teekond"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
+#. ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
+#. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4315
 msgid "Edit Route"
 msgstr "Lisa andmeid"
@@ -31280,10 +32153,13 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:4149
+#. <key key="type" value="route" />
+#. item "Relations/Directional Route (North America)" combo "Route type"
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "Route type"
 msgstr "teekonna tüüp"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -31292,19 +32168,23 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "road"
 msgstr "tee"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "ferry"
 msgstr "praam"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "ski"
 msgstr "suusad"
 
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 #. </rule>
@@ -31352,19 +32232,21 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4149 build/trans_style.java:199
-#: build/trans_style.java:531 build/trans_style.java:537
-#: build/trans_style.java:557 build/trans_style.java:563
-#: build/trans_style.java:582 build/trans_style.java:583
-#: build/trans_style.java:589
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_style.java:199 build/trans_style.java:531
+#: build/trans_style.java:537 build/trans_style.java:557
+#: build/trans_style.java:563 build/trans_style.java:582
+#: build/trans_style.java:583 build/trans_style.java:589
 msgid "foot"
 msgstr "jalgsi"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "hiking"
 msgstr "matkamine"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -31373,9 +32255,11 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "detour"
 msgstr "ümbersõit"
 
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -31384,5 +32268,6 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4149 build/trans_style.java:978
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -31391,5 +32276,6 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:4152
+#. item "Relations/Directional Route (North America)" text "Symbol description"
+#: build/trans_presets.java:4320 build/trans_presets.java:4350
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -31398,36 +32284,45 @@
 #. item "Relations/Route" text "Network"
 #. <optional>
+#. item "Relations/Directional Route (North America)" text "Network"
+#. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4155 build/trans_presets.java:4175
+#: build/trans_presets.java:4323 build/trans_presets.java:4353
+#: build/trans_presets.java:4375
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state"
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "proposed"
 msgstr "planeeritud"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "alternate"
 msgstr "täiendav"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "temporary"
 msgstr "ajutine"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "connection"
 msgstr "ühendus"
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:4158
+#. item "Relations/Directional Route (North America)" text "Color (hex)"
+#: build/trans_presets.java:4326 build/trans_presets.java:4356
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -31436,36 +32331,84 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:4161
+#. </optional>
+#. <roles>
+#. item "Relations/Directional Route (North America)" role "route segment"
+#: build/trans_presets.java:4329 build/trans_presets.java:4359
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:4330
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4331
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:4164
+#. item "Relations/Directional Route (North America)" role "halt point"
+#: build/trans_presets.java:4332 build/trans_presets.java:4364
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:4165
+#. item "Relations/Directional Route (North America)" role "forward halt point"
+#: build/trans_presets.java:4333 build/trans_presets.java:4365
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:4166
+#. item "Relations/Directional Route (North America)" role "backward halt point"
+#: build/trans_presets.java:4334 build/trans_presets.java:4366
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
 
 #. </roles>
+#. item "Relations/Directional Route (North America)"
+#: build/trans_presets.java:4337
+msgid "Directional Route (North America)"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
+#. ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
+#. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
+#. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
+#: build/trans_presets.java:4345
+msgid "Edit Directional Route (used in North America)"
+msgstr ""
+
+#. item "Relations/Directional Route (North America)" role "east segment"
+#: build/trans_presets.java:4360
+#, fuzzy
+msgid "east segment"
+msgstr "väline osa"
+
+#. item "Relations/Directional Route (North America)" role "north segment"
+#: build/trans_presets.java:4361
+#, fuzzy
+msgid "north segment"
+msgstr "väline osa"
+
+#. item "Relations/Directional Route (North America)" role "west segment"
+#: build/trans_presets.java:4362
+#, fuzzy
+msgid "west segment"
+msgstr "väline osa"
+
+#. item "Relations/Directional Route (North America)" role "south segment"
+#: build/trans_presets.java:4363
+#, fuzzy
+msgid "south segment"
+msgstr "väline osa"
+
+#. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4369
 msgid "Route network"
 msgstr ""
@@ -31473,5 +32416,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4371
 msgid "Edit route network"
 msgstr "Lisa andmeid"
@@ -31480,5 +32423,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4379
 msgid "member"
 msgstr "liige"
@@ -31486,5 +32429,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4382
 msgid "Associated street"
 msgstr "Seotud tänav"
@@ -31492,10 +32435,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4384
 msgid "Edit associated street"
 msgstr "Lisa andmeid"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4189
+#: build/trans_presets.java:4389
 msgid "house"
 msgstr "maja"
@@ -35678,26 +36621,25 @@
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
-#, fuzzy
 msgid "Line information"
-msgstr "Info"
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:589
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:619
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:650
 #, java-format
 msgid "min distance={0} px ({1} m)"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:692
 msgid "Convert way to FastDraw line"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:702
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -37441,5 +38383,5 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:220
 msgid "Name:"
 msgstr ""
@@ -38772,5 +39714,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:160
 msgid "no name"
 msgstr ""
@@ -38894,4 +39836,21 @@
 msgstr ""
 
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
+#, fuzzy
+msgid "Merge overlap"
+msgstr "Liida kihid"
+
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
+#, fuzzy
+msgid "Merge overlap of ways."
+msgstr "Kustuta sõlmi või jooni"
+
+#. Commit
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
+msgid "Merge Overlap (combine)"
+msgstr ""
+
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52
@@ -38926,5 +39885,5 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:41
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:21
 msgid "Convert to multipolygon"
 msgstr ""
@@ -38934,5 +39893,5 @@
 msgstr ""
 
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:80
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
@@ -39899,6 +40858,6 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:217
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:293
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1834
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1903
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1845
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1914
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:306
 msgid ""
@@ -39911,6 +40870,6 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:257
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:295
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1836
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1905
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1847
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1916
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:266
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:308
@@ -39975,5 +40934,5 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:255
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1027
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1038
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:294
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:476
@@ -39982,5 +40941,5 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:266
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1038
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1049
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:305
 msgid "Suggest Stops"
@@ -39989,6 +40948,6 @@
 #. JButton
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:321
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:750
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:873
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:761
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:884
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:360
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:497
@@ -39998,6 +40957,6 @@
 #. JButton
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:347
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:776
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:899
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:787
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:910
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:386
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:523
@@ -40065,5 +41024,5 @@
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:65
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:295
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:301
 #, java-format
 msgid "[ID] {0}"
@@ -40074,88 +41033,88 @@
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:149
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:155
 #, java-format
 msgid " [ID] {0}"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:417
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:423
 msgid "Route patterns ..."
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:418
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
 msgid "Edit Route patterns for public transport"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:429
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:435
 msgid "Route Patterns"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:432
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:438
 msgid "Overview"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:436
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:442
 msgid "Itinerary"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:438
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:444
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
 msgid "Stops"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:446
 msgid "Meta"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:454
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:460
 msgid "Existing route patterns:"
 msgstr ""
 
 #. JButton
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:538
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:830
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:953
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:544
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:841
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:964
 msgid "Reflect"
 msgstr ""
 
 #. JLabel
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:558
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:564
 msgid "Required tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:625
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:631
 msgid "Common tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:679
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:690
 msgid "Additional tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:708
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:719
 msgid "Add a new Tag"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:729
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:851
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:740
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:862
 msgid "Name/Id"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:852
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:863
 msgid "Ref"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:972
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
 msgid "Stops are possible on the"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
 msgid "right hand side"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
 msgid "left hand side"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1016
 msgid "Maximum distance from route"
 msgstr ""
@@ -42763,10 +43722,4 @@
 msgstr ""
 
-#~ msgid "Change values?"
-#~ msgstr "Muuta väärtusi?"
-
-#~ msgid "unusual tag combination"
-#~ msgstr "ebatavaline sildikombinatsioon"
-
-#~ msgid "Always update withouth asking"
-#~ msgstr "Uuenda alati küsimata"
+#~ msgid "fossil"
+#~ msgstr "fosiil"