Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 16407)
+++ applications/editors/josm/i18n/po/et.po	(revision 16450)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-09 10:40+0200\n"
-"PO-Revision-Date: 2009-07-06 19:13+0000\n"
+"POT-Creation-Date: 2009-07-12 13:56+0200\n"
+"PO-Revision-Date: 2009-07-09 11:22+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2009-07-12 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -33,7 +33,7 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:281
-#, fuzzy, java-format
+#, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "Projektsiooni ei saanud eelistusest lugeda. Kasutan Mercatori"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:394
@@ -81,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
@@ -97,7 +97,7 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
@@ -271,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
 msgid "Latitude"
 msgstr "Laiuskraad"
@@ -278,19 +278,19 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
 msgid "Longitude"
 msgstr "Pikkuskraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207
 msgid "Align Nodes in Circle"
 msgstr "Paiguta sõlmed ringikujuliselt."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
 msgid "Move the selected nodes into a circle."
 msgstr "Liiguta valitud sõlmed ringiks."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
@@ -314,6 +314,6 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
@@ -322,9 +322,5 @@
 msgstr "Tööriist {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92
-msgid "Some of the nodes are (almost) in the line"
-msgstr "Mõned sõlmed on enam-vähem ühel joonel."
-
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130
 msgid "Please select at least four nodes."
 msgstr "Palun vali vähemalt neli sõlme."
@@ -483,6 +479,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
 msgid "Enter values for all conflicts."
 msgstr "Sisesta kõigi vastuolude kohta väärtused."
@@ -490,5 +486,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Lahenda vastuolud."
@@ -537,9 +533,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
-#, fuzzy
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
-msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
@@ -548,6 +543,7 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
@@ -557,5 +553,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
@@ -711,12 +707,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -747,5 +742,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
@@ -755,5 +750,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 msgid "Edit"
 msgstr "Muuda"
@@ -914,5 +909,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
 msgid "New"
 msgstr "Uus"
@@ -1431,5 +1426,5 @@
 msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64
 msgid ""
 "No data to update found. Have you already opened or downloaded a data layer?"
@@ -1438,35 +1433,39 @@
 "laaditud?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65
+msgid "No data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61
 msgid "Failed to update the selected primitives."
 msgstr "Valitud primitiivide uuendamine ebaõnnestus."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62
 msgid "Update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76
 #, java-format
 msgid "Could not find primitive with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 msgid "Missing primitive"
 msgstr "Puuduv primitiiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189
 msgid "Update Selection"
 msgstr "Uuenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187
 msgid "Updates the currently selected primitives from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
 msgid "There are no selected primitives to update."
 msgstr "Ei ole valitud primitiive mida uuendada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204
 msgid "Selection empty"
 msgstr "Tühi valik"
@@ -1602,9 +1601,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562
 msgid "Upload to OSM API failed"
 msgstr "Laadimine OSM API-le ebaõnnestus"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575
 #, java-format
 msgid ""
@@ -1721,18 +1726,18 @@
 msgstr "Openstreetmapi andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Laen alla {0} {1}-st ({2} veel)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93
 msgid "The following errors occurred during mass download:"
 msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "Errors during Download"
 msgstr "Viga allaladimise ajal"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146
 #, java-format
 msgid ""
@@ -1744,5 +1749,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
 msgid "Deleted or moved primitives"
 msgstr "Kustutatud või nihutatud primitiivid"
@@ -1761,4 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 #, java-format
 msgid "Mode: {0}"
@@ -1901,7 +1907,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
-#, fuzzy
 msgid "Move elements"
-msgstr "Liigu vasakule"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
@@ -1914,12 +1919,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-#, fuzzy
 msgid "Move them"
-msgstr "Liigu vasakule"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-#, fuzzy
 msgid "Undo move"
-msgstr "Võta tagasi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
@@ -2200,12 +2203,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
-#, fuzzy, java-format
+#, java-format
 msgid "Add {0} {1}"
-msgstr "Kustuta {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Change {0} {1}"
-msgstr "Muuda {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
@@ -2241,5 +2244,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
 #, java-format
-msgid "ChangeRelationMemberRole {0} {1}"
+msgid "Change relation member role for {0} {1}"
 msgstr ""
 
@@ -2285,5 +2288,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 msgid "Delete from relation"
 msgstr ""
@@ -2319,10 +2322,10 @@
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
 msgid "node"
 msgid_plural "nodes"
@@ -2358,11 +2361,11 @@
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
 #, java-format
-msgid "RemoveRelationMember {0} {1}"
+msgid "Remove relation member {0} {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} {1}"
-msgstr "Kustuta {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2391,5 +2394,6 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-msgid "Main.ds doesn't include node {0}"
+#, java-format
+msgid "Main dataset does not include node {0}"
 msgstr ""
 
@@ -2398,5 +2402,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -2540,7 +2544,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
 msgid "incomplete"
 msgstr ""
@@ -2564,5 +2568,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
 msgid "way"
 msgid_plural "ways"
@@ -2575,8 +2579,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
 msgid "relation"
 msgid_plural "relations"
@@ -2606,5 +2610,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
 #, java-format
 msgid "{0} member"
@@ -2613,22 +2617,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
-#: build/trans_presets.java:2994
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132
+#: build/trans_presets.java:3002
 msgid "railway"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133
+msgid "waterway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134
+msgid "landuse"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
-msgid "waterway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
-msgid "landuse"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
 #, java-format
@@ -2877,7 +2881,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
-#, fuzzy, java-format
+#, java-format
 msgid "UTM Zone {0}"
-msgstr "Liiguta {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -3254,4 +3258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
@@ -3269,5 +3274,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3464,5 +3469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
@@ -3755,6 +3760,6 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
@@ -3799,7 +3804,7 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
@@ -3811,7 +3816,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -3882,5 +3887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
@@ -4063,6 +4068,6 @@
 msgstr "Kihid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
 #, java-format
 msgid "This will change up to {0} object."
@@ -4071,22 +4076,22 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
 msgid "An empty value deletes the key."
 msgstr "Tühi väärtus kustutab võtme."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:186
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:521
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96
 msgid "<different>"
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4095,44 +4100,45 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
 msgid "Please select the objects you want to change properties for."
 msgstr "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
@@ -4143,35 +4149,35 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
 msgid "Add"
 msgstr "Lisa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628
 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/PropertiesDialog.java:615
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631
 msgid "Edit Properties"
 msgstr "Muuda seadei"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634
 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/PropertiesDialog.java:621
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
@@ -4190,6 +4196,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130
-#: build/trans_presets.java:2959
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134
+#: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Seosed"
@@ -4199,9 +4205,9 @@
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
 msgid "Create a new relation"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
 #, java-format
 msgid "Relations: {0}"
@@ -4295,116 +4301,137 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181
 msgid "Basic"
 msgstr "Lihtne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216
 msgid "Occupied By"
 msgstr "Kasutab"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
-msgid "Tags (empty value deletes tag)"
-msgstr "Sildid (tühi väärtus kustutab sildi)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315
 msgid "Add Selected"
 msgstr "Lisa valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316
 msgid "Add all currently selected objects as members"
 msgstr "Lisa kõik hetkel valitud objektid liikmetena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323
 msgid "Remove all currently selected objects from relation"
 msgstr "Eemalda kõik hetkel valitud objektid seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329
 msgid "Sort"
-msgstr "Sport"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330
 msgid "Sort the selected relation members or the whole list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
 msgid "Remove the member in the current table row from this relation"
 msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#, java-format
+msgid "Members: {0} (linked: {1})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692
+#, java-format
+msgid "Relation Editor: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797
+msgid "Download relation members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853
+msgid "Conflicts in data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96
 #, fuzzy, java-format
-msgid "Members: {0} (linked: {1})"
-msgstr "Liikmed: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
-#, java-format
-msgid "Relation Editor: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
-msgid "There were conflicts during import."
-msgstr "Importimisel tekkisid konfliktid."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
-msgid "Error parsing server response."
-msgstr "Viga serveri vastuse töötlemisel."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
-msgid "Cannot connect to server."
-msgstr "Ei saa serveriga ühenduda."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
-msgid "Error when communicating with server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
-msgid "Create new relation"
+msgid "Create new relation in layer ''{0}''"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:69
-msgid "Edit new relation"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98
+#, fuzzy, java-format
+msgid "Edit new relation in layer ''{0}''"
 msgstr "Muuda uut seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:70
-#, java-format
-msgid "Edit relation #{0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99
+#, fuzzy, java-format
+msgid "Edit relation #{0} in layer ''{1}''"
 msgstr "Muuda seost #{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
+msgid "<multiple>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -4494,5 +4521,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2612
 msgid "Places"
 msgstr "Asukohad"
@@ -4539,21 +4566,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:1845 build/trans_presets.java:1851
+#: build/trans_presets.java:1857 build/trans_presets.java:1863
+#: build/trans_presets.java:1869 build/trans_presets.java:1875
+#: build/trans_presets.java:1881 build/trans_presets.java:1887
+#: build/trans_presets.java:1893 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1911
+#: build/trans_presets.java:1917 build/trans_presets.java:1923
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1945 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
 msgid "type"
 msgstr "tüüp"
@@ -4568,4 +4595,11 @@
 msgid "zoom"
 msgstr "suurendus"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Click."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
@@ -5340,149 +5374,149 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:56 build/trans_presets.java:92
-#: build/trans_presets.java:132 build/trans_presets.java:169
-#: build/trans_presets.java:189 build/trans_presets.java:207
-#: build/trans_presets.java:224 build/trans_presets.java:242
-#: build/trans_presets.java:262 build/trans_presets.java:295
-#: build/trans_presets.java:340 build/trans_presets.java:360
-#: build/trans_presets.java:375 build/trans_presets.java:392
-#: build/trans_presets.java:412 build/trans_presets.java:432
-#: build/trans_presets.java:451 build/trans_presets.java:469
-#: build/trans_presets.java:489 build/trans_presets.java:509
-#: build/trans_presets.java:530 build/trans_presets.java:551
-#: build/trans_presets.java:572 build/trans_presets.java:593
-#: build/trans_presets.java:614 build/trans_presets.java:643
-#: build/trans_presets.java:664 build/trans_presets.java:677
-#: build/trans_presets.java:690 build/trans_presets.java:703
-#: build/trans_presets.java:716 build/trans_presets.java:729
-#: build/trans_presets.java:740 build/trans_presets.java:749
-#: build/trans_presets.java:796 build/trans_presets.java:817
-#: build/trans_presets.java:826 build/trans_presets.java:886
-#: build/trans_presets.java:1027 build/trans_presets.java:1035
-#: build/trans_presets.java:1043 build/trans_presets.java:1051
-#: build/trans_presets.java:1061 build/trans_presets.java:1069
-#: build/trans_presets.java:1074 build/trans_presets.java:1081
-#: build/trans_presets.java:1088 build/trans_presets.java:1093
-#: build/trans_presets.java:1101 build/trans_presets.java:1110
-#: build/trans_presets.java:1116 build/trans_presets.java:1122
-#: build/trans_presets.java:1127 build/trans_presets.java:1133
-#: build/trans_presets.java:1139 build/trans_presets.java:1148
-#: build/trans_presets.java:1157 build/trans_presets.java:1164
-#: build/trans_presets.java:1172 build/trans_presets.java:1185
-#: build/trans_presets.java:1191 build/trans_presets.java:1200
-#: build/trans_presets.java:1206 build/trans_presets.java:1212
-#: build/trans_presets.java:1220 build/trans_presets.java:1275
-#: build/trans_presets.java:1322 build/trans_presets.java:1328
-#: build/trans_presets.java:1334 build/trans_presets.java:1340
-#: build/trans_presets.java:1346 build/trans_presets.java:1357
-#: build/trans_presets.java:1365 build/trans_presets.java:1374
-#: build/trans_presets.java:1381 build/trans_presets.java:1387
-#: build/trans_presets.java:1395 build/trans_presets.java:1402
-#: build/trans_presets.java:1411 build/trans_presets.java:1419
-#: build/trans_presets.java:1426 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1457
-#: build/trans_presets.java:1477 build/trans_presets.java:1489
-#: build/trans_presets.java:1500 build/trans_presets.java:1517
-#: build/trans_presets.java:1524 build/trans_presets.java:1539
-#: build/trans_presets.java:1546 build/trans_presets.java:1551
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1568 build/trans_presets.java:1574
-#: build/trans_presets.java:1580 build/trans_presets.java:1588
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1608 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1625
-#: build/trans_presets.java:1632 build/trans_presets.java:1639
-#: build/trans_presets.java:1646 build/trans_presets.java:1652
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1672 build/trans_presets.java:1678
-#: build/trans_presets.java:1685 build/trans_presets.java:1693
-#: build/trans_presets.java:1699 build/trans_presets.java:1706
-#: build/trans_presets.java:1712 build/trans_presets.java:1722
-#: build/trans_presets.java:1727 build/trans_presets.java:1734
-#: build/trans_presets.java:1740 build/trans_presets.java:1746
-#: build/trans_presets.java:1752 build/trans_presets.java:1757
-#: build/trans_presets.java:1762 build/trans_presets.java:1769
-#: build/trans_presets.java:1775 build/trans_presets.java:1780
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
-#: build/trans_presets.java:1824 build/trans_presets.java:1829
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2072
-#: build/trans_presets.java:2079 build/trans_presets.java:2087
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2132 build/trans_presets.java:2139
-#: build/trans_presets.java:2145 build/trans_presets.java:2152
-#: build/trans_presets.java:2160 build/trans_presets.java:2191
-#: build/trans_presets.java:2196 build/trans_presets.java:2201
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2232 build/trans_presets.java:2238
-#: build/trans_presets.java:2244 build/trans_presets.java:2250
-#: build/trans_presets.java:2256 build/trans_presets.java:2266
-#: build/trans_presets.java:2359 build/trans_presets.java:2366
-#: build/trans_presets.java:2380 build/trans_presets.java:2386
-#: build/trans_presets.java:2392 build/trans_presets.java:2413
-#: build/trans_presets.java:2419 build/trans_presets.java:2425
-#: build/trans_presets.java:2430 build/trans_presets.java:2436
-#: build/trans_presets.java:2441 build/trans_presets.java:2446
-#: build/trans_presets.java:2451 build/trans_presets.java:2456
-#: build/trans_presets.java:2461 build/trans_presets.java:2467
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2484 build/trans_presets.java:2489
-#: build/trans_presets.java:2494 build/trans_presets.java:2499
-#: build/trans_presets.java:2504 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2527 build/trans_presets.java:2532
-#: build/trans_presets.java:2541 build/trans_presets.java:2548
-#: build/trans_presets.java:2562 build/trans_presets.java:2567
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2600 build/trans_presets.java:2609
-#: build/trans_presets.java:2615 build/trans_presets.java:2621
-#: build/trans_presets.java:2627 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2647
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2688
-#: build/trans_presets.java:2694 build/trans_presets.java:2701
-#: build/trans_presets.java:2708 build/trans_presets.java:2717
-#: build/trans_presets.java:2723 build/trans_presets.java:2729
-#: build/trans_presets.java:2735 build/trans_presets.java:2741
-#: build/trans_presets.java:2750 build/trans_presets.java:2760
-#: build/trans_presets.java:2769 build/trans_presets.java:2775
-#: build/trans_presets.java:2781 build/trans_presets.java:2786
-#: build/trans_presets.java:2792 build/trans_presets.java:2798
-#: 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:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2861
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2890
-#: 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:2930
-#: build/trans_presets.java:2936 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2954
-#: build/trans_presets.java:2967 build/trans_presets.java:2981
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:140 build/trans_presets.java:177
+#: build/trans_presets.java:197 build/trans_presets.java:215
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:270 build/trans_presets.java:303
+#: build/trans_presets.java:348 build/trans_presets.java:368
+#: build/trans_presets.java:383 build/trans_presets.java:400
+#: build/trans_presets.java:420 build/trans_presets.java:440
+#: build/trans_presets.java:459 build/trans_presets.java:477
+#: build/trans_presets.java:497 build/trans_presets.java:517
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:580 build/trans_presets.java:601
+#: build/trans_presets.java:622 build/trans_presets.java:651
+#: build/trans_presets.java:672 build/trans_presets.java:685
+#: build/trans_presets.java:698 build/trans_presets.java:711
+#: build/trans_presets.java:724 build/trans_presets.java:737
+#: build/trans_presets.java:748 build/trans_presets.java:757
+#: build/trans_presets.java:804 build/trans_presets.java:825
+#: build/trans_presets.java:834 build/trans_presets.java:894
+#: build/trans_presets.java:1035 build/trans_presets.java:1043
+#: build/trans_presets.java:1051 build/trans_presets.java:1059
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1082 build/trans_presets.java:1089
+#: build/trans_presets.java:1096 build/trans_presets.java:1101
+#: build/trans_presets.java:1109 build/trans_presets.java:1118
+#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:1135 build/trans_presets.java:1141
+#: build/trans_presets.java:1147 build/trans_presets.java:1156
+#: build/trans_presets.java:1165 build/trans_presets.java:1172
+#: build/trans_presets.java:1180 build/trans_presets.java:1193
+#: build/trans_presets.java:1199 build/trans_presets.java:1208
+#: build/trans_presets.java:1214 build/trans_presets.java:1220
+#: build/trans_presets.java:1228 build/trans_presets.java:1283
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1348
+#: build/trans_presets.java:1354 build/trans_presets.java:1365
+#: build/trans_presets.java:1373 build/trans_presets.java:1382
+#: build/trans_presets.java:1389 build/trans_presets.java:1395
+#: build/trans_presets.java:1403 build/trans_presets.java:1410
+#: build/trans_presets.java:1419 build/trans_presets.java:1427
+#: build/trans_presets.java:1434 build/trans_presets.java:1445
+#: build/trans_presets.java:1455 build/trans_presets.java:1465
+#: build/trans_presets.java:1485 build/trans_presets.java:1497
+#: build/trans_presets.java:1508 build/trans_presets.java:1525
+#: build/trans_presets.java:1532 build/trans_presets.java:1547
+#: build/trans_presets.java:1554 build/trans_presets.java:1559
+#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:1588 build/trans_presets.java:1596
+#: build/trans_presets.java:1603 build/trans_presets.java:1610
+#: build/trans_presets.java:1616 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1633
+#: build/trans_presets.java:1640 build/trans_presets.java:1647
+#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1666 build/trans_presets.java:1672
+#: build/trans_presets.java:1680 build/trans_presets.java:1686
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1714
+#: build/trans_presets.java:1720 build/trans_presets.java:1730
+#: build/trans_presets.java:1735 build/trans_presets.java:1742
+#: build/trans_presets.java:1748 build/trans_presets.java:1754
+#: build/trans_presets.java:1760 build/trans_presets.java:1765
+#: build/trans_presets.java:1770 build/trans_presets.java:1777
+#: build/trans_presets.java:1783 build/trans_presets.java:1788
+#: build/trans_presets.java:1796 build/trans_presets.java:1805
+#: build/trans_presets.java:1814 build/trans_presets.java:1823
+#: build/trans_presets.java:1832 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1935
+#: build/trans_presets.java:1944 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2080
+#: build/trans_presets.java:2087 build/trans_presets.java:2095
+#: build/trans_presets.java:2102 build/trans_presets.java:2108
+#: build/trans_presets.java:2114 build/trans_presets.java:2120
+#: build/trans_presets.java:2126 build/trans_presets.java:2132
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2160
+#: build/trans_presets.java:2168 build/trans_presets.java:2199
+#: build/trans_presets.java:2204 build/trans_presets.java:2209
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2274
+#: build/trans_presets.java:2367 build/trans_presets.java:2374
+#: build/trans_presets.java:2388 build/trans_presets.java:2394
+#: build/trans_presets.java:2400 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2454
+#: build/trans_presets.java:2459 build/trans_presets.java:2464
+#: build/trans_presets.java:2469 build/trans_presets.java:2475
+#: build/trans_presets.java:2481 build/trans_presets.java:2487
+#: build/trans_presets.java:2492 build/trans_presets.java:2497
+#: build/trans_presets.java:2502 build/trans_presets.java:2507
+#: build/trans_presets.java:2512 build/trans_presets.java:2518
+#: build/trans_presets.java:2524 build/trans_presets.java:2530
+#: build/trans_presets.java:2535 build/trans_presets.java:2540
+#: build/trans_presets.java:2549 build/trans_presets.java:2556
+#: build/trans_presets.java:2570 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2608 build/trans_presets.java:2617
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2635 build/trans_presets.java:2641
+#: build/trans_presets.java:2648 build/trans_presets.java:2655
+#: build/trans_presets.java:2662 build/trans_presets.java:2668
+#: build/trans_presets.java:2674 build/trans_presets.java:2682
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2758 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2783
+#: build/trans_presets.java:2789 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2806
+#: build/trans_presets.java:2815 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2864 build/trans_presets.java:2869
+#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#: build/trans_presets.java:2889 build/trans_presets.java:2898
+#: build/trans_presets.java:2906 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2938
+#: build/trans_presets.java:2944 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2962
+#: build/trans_presets.java:2975 build/trans_presets.java:2989
+#: build/trans_presets.java:3003
 msgid "Name"
 msgstr "Nimi"
@@ -5830,9 +5864,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
 #, java-format
@@ -5860,21 +5889,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:1845 build/trans_presets.java:1851
+#: build/trans_presets.java:1857 build/trans_presets.java:1863
+#: build/trans_presets.java:1869 build/trans_presets.java:1875
+#: build/trans_presets.java:1881 build/trans_presets.java:1887
+#: build/trans_presets.java:1893 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1911
+#: build/trans_presets.java:1917 build/trans_presets.java:1923
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1945 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
 msgid "track"
 msgid_plural "tracks"
@@ -6022,5 +6051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Please select the row to edit."
 msgstr "PAlun vali rida muutmiseks"
@@ -6036,5 +6065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
 msgid "Please select the row to delete."
@@ -6239,5 +6268,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1358
 msgid "Car"
 msgstr ""
@@ -6258,12 +6287,12 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:313 build/trans_presets.java:639
-#: 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:1406 build/trans_presets.java:1479
+#: build/trans_presets.java:321 build/trans_presets.java:647
+#: build/trans_presets.java:850 build/trans_presets.java:869
+#: build/trans_presets.java:883 build/trans_presets.java:905
+#: build/trans_presets.java:942 build/trans_presets.java:955
+#: build/trans_presets.java:967 build/trans_presets.java:979
+#: build/trans_presets.java:991 build/trans_presets.java:1003
+#: build/trans_presets.java:1013 build/trans_presets.java:1022
+#: build/trans_presets.java:1414 build/trans_presets.java:1487
 msgid "Bicycle"
 msgstr ""
@@ -6294,11 +6323,11 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:314 build/trans_presets.java:641
-#: build/trans_presets.java:841 build/trans_presets.java:860
-#: build/trans_presets.java:874 build/trans_presets.java:896
-#: build/trans_presets.java:933 build/trans_presets.java:946
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1004 build/trans_presets.java:1013
+#: build/trans_presets.java:322 build/trans_presets.java:649
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
 msgid "Foot"
 msgstr ""
@@ -6694,27 +6723,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "Short Description: {0}"
-msgstr "Valik: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "URL: {0}"
-msgstr "Kihid: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
-#, fuzzy, java-format
+#, java-format
 msgid "Author: {0}"
-msgstr "Autorid: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
-#, fuzzy, java-format
+#, java-format
 msgid "Webpage: {0}"
-msgstr "Abi: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
-#, fuzzy, java-format
+#, java-format
 msgid "Version: {0}"
-msgstr "Versioon {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
@@ -6725,7 +6754,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
-#, fuzzy
 msgid "Copy defaults"
-msgstr "Vaikimisi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
@@ -6740,10 +6768,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
-#, fuzzy
 msgid "Add a new XML source to the list."
-msgstr "Ühenda uus sõlm olemasoleva teega"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -6913,33 +6940,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:400
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:444
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Kasuta eelseadet \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
 msgid "closedway"
 msgstr "suletud tee"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
@@ -6950,15 +6977,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -6968,18 +6995,18 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 msgid "Change Properties"
 msgstr "Muuda seadeid"
@@ -7012,5 +7039,5 @@
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)."
@@ -7151,4 +7178,15 @@
 msgstr "Üleslaadimine..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#, java-format
+msgid "(Code={0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#, java-format
+msgid "The server replied an error with code {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -7240,58 +7278,58 @@
 msgstr "OSM serveri failid"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
 msgid "Unknown version"
 msgstr "Tundmatu versioon"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
 msgid "Found <nd> element in non-way."
 msgstr "Leidsin <nd> elemendi mitte-tees."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
 msgid "<nd> has zero ref"
 msgstr "<nd> ei oma ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
 msgid "Found <member> element in non-relation."
 msgstr "Leidub <member> element, mis ei ole seotud"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
 #, java-format
 msgid "Missing attribute \"ref\" on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #, java-format
 msgid "Missing attribute \"type\" on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Puudulik <member> määratlus ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
 msgid "Illegal object with id=0"
 msgstr "Illegaalne objekt numbriga id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318
 #, java-format
 msgid ""
@@ -7299,24 +7337,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Puudub vajalik atribuut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501
 msgid "Ill-formed node id"
 msgstr ""
@@ -7505,9 +7543,9 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169
 msgid "More details"
 msgstr ""
@@ -7555,31 +7593,31 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:1314
+#: build/trans_presets.java:1376
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
@@ -7721,5 +7759,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "Description"
 msgstr ""
@@ -8986,7 +9024,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:952 build/trans_style.java:969
-#: build/trans_style.java:985 build/trans_style.java:3344
-#: build/trans_style.java:3352
+#: build/trans_style.java:963 build/trans_style.java:980
+#: build/trans_style.java:996 build/trans_style.java:3355
+#: build/trans_style.java:3363
 msgid "water"
 msgstr ""
@@ -9469,4 +9507,17 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
 msgid "Remote Control has been asked to import data from the following URL:"
+msgstr ""
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+msgid "Edit relation"
+msgstr ""
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+msgid "Edit relations"
+msgstr ""
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72
+msgid "No relation is selected"
 msgstr ""
 
@@ -9716,22 +9767,4 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-msgid "<multiple>"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
-#, java-format
-msgid "Remove old keys from up to {0} object"
-msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
-#, java-format
-msgid "Updating properties of up to {0} object"
-msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -9829,5 +9862,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2181
 msgid "Street name"
 msgstr ""
@@ -9874,30 +9907,30 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
 msgstr "Kattuvate alade ühendamine"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Joins areas that overlap each other"
 msgstr "Ühendab üksteist katvad alad"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
 msgid "Continue anyway"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:134
 msgid "Only up to two areas can be joined at the moment."
 msgstr "Praegu saab ühendada ainult kuni kaks ala."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:139
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:156
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
@@ -9907,38 +9940,38 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:159
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
 msgid "Please select at least one closed way the should be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -9946,65 +9979,65 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886
 msgid "Join Areas Function"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
 msgid "Jump To Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
 msgid "Opens a dialog that allows to jump to a specific location"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
 msgid "Enter Lat/Lon to jump to position."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10220,5 +10253,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118
 msgid "Crossing ways"
 msgstr ""
@@ -10312,23 +10345,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
 #, java-format
 msgid ""
@@ -10337,5 +10370,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10343,78 +10378,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10422,82 +10457,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10642,7 +10677,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4079 build/trans_style.java:4086
-#: build/trans_style.java:4093 build/trans_style.java:4100
-#: build/trans_style.java:4107
+#: build/trans_style.java:4090 build/trans_style.java:4097
+#: build/trans_style.java:4104 build/trans_style.java:4111
+#: build/trans_style.java:4118
 msgid "building"
 msgstr ""
@@ -10656,5 +10691,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4114
+#: build/trans_style.java:4125
 msgid "area"
 msgstr ""
@@ -10697,30 +10732,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
-#, fuzzy
-msgid "Unnamed Junction"
-msgstr "ühendus"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+msgid "Unnamed junction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
 msgid "One node ways"
 msgstr ""
@@ -10973,7 +11007,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
-#, fuzzy
 msgid "Downloader:"
-msgstr "Lae alla"
+msgstr ""
 
 #. *
@@ -11155,11 +11188,18 @@
 msgstr ""
 
+#. Plugin routes
+#: build/trans_plugins.java:49
+msgid ""
+"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
+"defined in routes.xml file in plugin directory"
+msgstr ""
+
 #. Plugin routing
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -11168,15 +11208,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -11186,10 +11226,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11198,5 +11238,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11205,5 +11245,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11212,10 +11252,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11258,8 +11298,15 @@
 #. default: ticked on/off
 #. delete_if_empty: true/false
+#. For external files the <annotations> should have following elements:
+#. - author           the author of the preset
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your preset meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
 #. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
 #. -->
 #. <annotations>
-#: build/trans_presets.java:47
+#: build/trans_presets.java:55
 msgid "Streets"
 msgstr ""
@@ -11270,5 +11317,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:48 build/trans_surveyor.java:72
+#: build/trans_presets.java:56 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -11277,5 +11324,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:51
+#: build/trans_presets.java:59
 msgid "Edit Motorway"
 msgstr ""
@@ -11302,8 +11349,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:54 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:130
-#: build/trans_presets.java:167 build/trans_presets.java:187
-#: build/trans_presets.java:1526 build/trans_presets.java:2996
+#: build/trans_presets.java:62 build/trans_presets.java:98
+#: build/trans_presets.java:118 build/trans_presets.java:138
+#: build/trans_presets.java:175 build/trans_presets.java:195
+#: build/trans_presets.java:1534 build/trans_presets.java:3004
 msgid "Reference"
 msgstr ""
@@ -11344,21 +11391,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:57 build/trans_presets.java:74
-#: build/trans_presets.java:93 build/trans_presets.java:112
-#: build/trans_presets.java:133 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:190
-#: build/trans_presets.java:213 build/trans_presets.java:231
-#: build/trans_presets.java:249 build/trans_presets.java:268
-#: build/trans_presets.java:301 build/trans_presets.java:346
-#: build/trans_presets.java:361 build/trans_presets.java:376
-#: build/trans_presets.java:398 build/trans_presets.java:418
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:476 build/trans_presets.java:495
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:557 build/trans_presets.java:578
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:649 build/trans_presets.java:1036
-#: build/trans_presets.java:1044 build/trans_presets.java:1052
-#: build/trans_presets.java:1062 build/trans_presets.java:1281
+#: build/trans_presets.java:65 build/trans_presets.java:82
+#: build/trans_presets.java:101 build/trans_presets.java:120
+#: build/trans_presets.java:141 build/trans_presets.java:157
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:369 build/trans_presets.java:384
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:657 build/trans_presets.java:1044
+#: build/trans_presets.java:1052 build/trans_presets.java:1060
+#: build/trans_presets.java:1070 build/trans_presets.java:1289
 msgid "Layer"
 msgstr ""
@@ -11372,8 +11419,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:58 build/trans_presets.java:75
-#: build/trans_presets.java:94 build/trans_presets.java:113
-#: build/trans_presets.java:134 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:347
+#: build/trans_presets.java:66 build/trans_presets.java:83
+#: build/trans_presets.java:102 build/trans_presets.java:121
+#: build/trans_presets.java:142 build/trans_presets.java:158
+#: build/trans_presets.java:179 build/trans_presets.java:355
 msgid "Lanes"
 msgstr ""
@@ -11391,15 +11438,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:59 build/trans_presets.java:76
-#: build/trans_presets.java:95 build/trans_presets.java:114
-#: build/trans_presets.java:135 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:191
-#: build/trans_presets.java:214 build/trans_presets.java:270
-#: build/trans_presets.java:302 build/trans_presets.java:323
-#: build/trans_presets.java:362 build/trans_presets.java:377
-#: build/trans_presets.java:401 build/trans_presets.java:420
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:497 build/trans_presets.java:651
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:199
+#: build/trans_presets.java:222 build/trans_presets.java:278
+#: build/trans_presets.java:310 build/trans_presets.java:331
+#: build/trans_presets.java:370 build/trans_presets.java:385
+#: build/trans_presets.java:409 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:505 build/trans_presets.java:659
+#: build/trans_presets.java:1291
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -11436,16 +11483,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:60 build/trans_presets.java:77
-#: build/trans_presets.java:96 build/trans_presets.java:115
-#: build/trans_presets.java:136 build/trans_presets.java:152
-#: build/trans_presets.java:173 build/trans_presets.java:192
-#: build/trans_presets.java:208 build/trans_presets.java:226
-#: build/trans_presets.java:244 build/trans_presets.java:263
-#: build/trans_presets.java:283 build/trans_presets.java:296
-#: build/trans_presets.java:309 build/trans_presets.java:341
-#: build/trans_presets.java:393 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:452
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:644 build/trans_presets.java:1276
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:200
+#: build/trans_presets.java:216 build/trans_presets.java:234
+#: build/trans_presets.java:252 build/trans_presets.java:271
+#: build/trans_presets.java:291 build/trans_presets.java:304
+#: build/trans_presets.java:317 build/trans_presets.java:349
+#: build/trans_presets.java:401 build/trans_presets.java:421
+#: build/trans_presets.java:441 build/trans_presets.java:460
+#: build/trans_presets.java:479 build/trans_presets.java:498
+#: build/trans_presets.java:652 build/trans_presets.java:1284
 msgid "Oneway"
 msgstr ""
@@ -11487,19 +11534,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:61 build/trans_presets.java:78
-#: build/trans_presets.java:98 build/trans_presets.java:117
-#: build/trans_presets.java:138 build/trans_presets.java:154
-#: build/trans_presets.java:174 build/trans_presets.java:193
-#: build/trans_presets.java:209 build/trans_presets.java:227
-#: build/trans_presets.java:245 build/trans_presets.java:264
-#: build/trans_presets.java:297 build/trans_presets.java:342
-#: build/trans_presets.java:351 build/trans_presets.java:394
-#: build/trans_presets.java:414 build/trans_presets.java:434
-#: build/trans_presets.java:453 build/trans_presets.java:472
-#: build/trans_presets.java:491 build/trans_presets.java:510
-#: build/trans_presets.java:531 build/trans_presets.java:552
-#: build/trans_presets.java:573 build/trans_presets.java:594
-#: build/trans_presets.java:615 build/trans_presets.java:645
-#: build/trans_presets.java:1277 build/trans_surveyor.java:12
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:217 build/trans_presets.java:235
+#: build/trans_presets.java:253 build/trans_presets.java:272
+#: build/trans_presets.java:305 build/trans_presets.java:350
+#: build/trans_presets.java:359 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:480
+#: build/trans_presets.java:499 build/trans_presets.java:518
+#: build/trans_presets.java:539 build/trans_presets.java:560
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:653
+#: build/trans_presets.java:1285 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -11535,19 +11582,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:62 build/trans_presets.java:79
-#: build/trans_presets.java:99 build/trans_presets.java:118
-#: build/trans_presets.java:139 build/trans_presets.java:155
-#: build/trans_presets.java:175 build/trans_presets.java:194
-#: build/trans_presets.java:210 build/trans_presets.java:228
-#: build/trans_presets.java:246 build/trans_presets.java:265
-#: build/trans_presets.java:298 build/trans_presets.java:343
-#: build/trans_presets.java:367 build/trans_presets.java:395
-#: build/trans_presets.java:415 build/trans_presets.java:435
-#: build/trans_presets.java:454 build/trans_presets.java:473
-#: build/trans_presets.java:492 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:646
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:306 build/trans_presets.java:351
+#: build/trans_presets.java:375 build/trans_presets.java:403
+#: build/trans_presets.java:423 build/trans_presets.java:443
+#: build/trans_presets.java:462 build/trans_presets.java:481
+#: build/trans_presets.java:500 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:654
+#: build/trans_presets.java:1286
 msgid "Tunnel"
 msgstr ""
@@ -11581,18 +11628,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:63 build/trans_presets.java:80
-#: build/trans_presets.java:100 build/trans_presets.java:119
-#: build/trans_presets.java:140 build/trans_presets.java:156
-#: build/trans_presets.java:176 build/trans_presets.java:195
-#: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:247 build/trans_presets.java:266
-#: build/trans_presets.java:299 build/trans_presets.java:344
-#: build/trans_presets.java:396 build/trans_presets.java:416
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:474 build/trans_presets.java:493
-#: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:554 build/trans_presets.java:575
-#: build/trans_presets.java:596 build/trans_presets.java:617
-#: build/trans_presets.java:647 build/trans_presets.java:1279
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:444 build/trans_presets.java:463
+#: build/trans_presets.java:482 build/trans_presets.java:501
+#: build/trans_presets.java:520 build/trans_presets.java:541
+#: build/trans_presets.java:562 build/trans_presets.java:583
+#: build/trans_presets.java:604 build/trans_presets.java:625
+#: build/trans_presets.java:655 build/trans_presets.java:1287
 msgid "Cutting"
 msgstr ""
@@ -11626,18 +11673,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:64 build/trans_presets.java:81
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:177 build/trans_presets.java:196
-#: build/trans_presets.java:212 build/trans_presets.java:230
-#: build/trans_presets.java:248 build/trans_presets.java:267
-#: build/trans_presets.java:300 build/trans_presets.java:345
-#: build/trans_presets.java:397 build/trans_presets.java:417
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:475 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:534
-#: build/trans_presets.java:555 build/trans_presets.java:576
-#: build/trans_presets.java:597 build/trans_presets.java:618
-#: build/trans_presets.java:648 build/trans_presets.java:1280
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:464
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:542
+#: build/trans_presets.java:563 build/trans_presets.java:584
+#: build/trans_presets.java:605 build/trans_presets.java:626
+#: build/trans_presets.java:656 build/trans_presets.java:1288
 msgid "Embankment"
 msgstr ""
@@ -11645,5 +11692,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:67
+#: build/trans_presets.java:75
 msgid "Motorway Link"
 msgstr ""
@@ -11652,5 +11699,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:70
+#: build/trans_presets.java:78
 msgid "Edit Motorway Link"
 msgstr ""
@@ -11658,5 +11705,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:84
+#: build/trans_presets.java:92
 msgid "Trunk"
 msgstr ""
@@ -11665,5 +11712,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:87
+#: build/trans_presets.java:95
 msgid "Edit Trunk"
 msgstr ""
@@ -11673,6 +11720,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:97 build/trans_presets.java:116
-#: build/trans_presets.java:137 build/trans_presets.java:153
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
 msgid "Motorroad"
 msgstr ""
@@ -11680,5 +11727,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:104
+#: build/trans_presets.java:112
 msgid "Trunk Link"
 msgstr ""
@@ -11687,5 +11734,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:107
+#: build/trans_presets.java:115
 msgid "Edit Trunk Link"
 msgstr ""
@@ -11698,5 +11745,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:124 build/trans_surveyor.java:76
+#: build/trans_presets.java:132 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -11705,5 +11752,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:127
+#: build/trans_presets.java:135
 msgid "Edit Primary Road"
 msgstr ""
@@ -11711,10 +11758,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:144
+#: build/trans_presets.java:152
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:145
+#: build/trans_presets.java:153
 msgid "Edit Primary Link"
 msgstr ""
@@ -11726,5 +11773,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:160 build/trans_surveyor.java:80
+#: build/trans_presets.java:168 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -11734,5 +11781,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:164
+#: build/trans_presets.java:172
 msgid "Edit Secondary Road"
 msgstr ""
@@ -11740,5 +11787,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:180
+#: build/trans_presets.java:188
 msgid "Tertiary"
 msgstr ""
@@ -11748,5 +11795,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:184
+#: build/trans_presets.java:192
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -11758,5 +11805,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:199 build/trans_surveyor.java:84
+#: build/trans_presets.java:207 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -11766,5 +11813,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:203
+#: build/trans_presets.java:211
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -11791,19 +11838,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:215 build/trans_presets.java:233
-#: build/trans_presets.java:251 build/trans_presets.java:271
-#: build/trans_presets.java:303 build/trans_presets.java:348
-#: build/trans_presets.java:364 build/trans_presets.java:378
-#: build/trans_presets.java:402 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:478 build/trans_presets.java:498
-#: build/trans_presets.java:519 build/trans_presets.java:540
-#: build/trans_presets.java:561 build/trans_presets.java:582
-#: build/trans_presets.java:603 build/trans_presets.java:624
-#: build/trans_presets.java:652 build/trans_presets.java:665
-#: build/trans_presets.java:678 build/trans_presets.java:691
-#: build/trans_presets.java:704 build/trans_presets.java:717
-#: build/trans_presets.java:730 build/trans_presets.java:1284
-#: build/trans_presets.java:1467 build/trans_presets.java:1509
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:279
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:372 build/trans_presets.java:386
+#: build/trans_presets.java:410 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:486 build/trans_presets.java:506
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:660 build/trans_presets.java:673
+#: build/trans_presets.java:686 build/trans_presets.java:699
+#: build/trans_presets.java:712 build/trans_presets.java:725
+#: build/trans_presets.java:738 build/trans_presets.java:1292
+#: build/trans_presets.java:1475 build/trans_presets.java:1517
 msgid "Width (meters)"
 msgstr ""
@@ -11815,5 +11862,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:218 build/trans_surveyor.java:88
+#: build/trans_presets.java:226 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -11822,5 +11869,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:221
+#: build/trans_presets.java:229
 msgid "Edit Residential Street"
 msgstr ""
@@ -11844,13 +11891,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:269 build/trans_presets.java:284
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:439 build/trans_presets.java:458
-#: build/trans_presets.java:477 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:577
-#: build/trans_presets.java:598 build/trans_presets.java:619
-#: build/trans_presets.java:650 build/trans_presets.java:1282
+#: build/trans_presets.java:240 build/trans_presets.java:258
+#: build/trans_presets.java:277 build/trans_presets.java:292
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:658 build/trans_presets.java:1290
 msgid "Surface"
 msgstr ""
@@ -11870,20 +11917,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:269 build/trans_presets.java:284
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:439 build/trans_presets.java:458
-#: build/trans_presets.java:477 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:650 build/trans_presets.java:1282
+#: build/trans_presets.java:240 build/trans_presets.java:258
+#: build/trans_presets.java:277 build/trans_presets.java:292
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:658 build/trans_presets.java:1290
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:269 build/trans_presets.java:284
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:439 build/trans_presets.java:458
-#: build/trans_presets.java:477 build/trans_presets.java:496
-#: build/trans_presets.java:650 build/trans_presets.java:1282
+#: build/trans_presets.java:240 build/trans_presets.java:258
+#: build/trans_presets.java:277 build/trans_presets.java:292
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:658 build/trans_presets.java:1290
 msgid "unpaved"
 msgstr ""
@@ -11891,12 +11938,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:269 build/trans_presets.java:284
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:439 build/trans_presets.java:458
-#: build/trans_presets.java:477 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:577
-#: build/trans_presets.java:650 build/trans_presets.java:1282
+#: build/trans_presets.java:240 build/trans_presets.java:258
+#: build/trans_presets.java:277 build/trans_presets.java:292
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:658 build/trans_presets.java:1290
 msgid "cobblestone"
 msgstr ""
@@ -11904,5 +11951,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:236
+#: build/trans_presets.java:244
 msgid "Living Street"
 msgstr ""
@@ -11911,5 +11958,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:239
+#: build/trans_presets.java:247
 msgid "Edit Living Street"
 msgstr ""
@@ -11917,5 +11964,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:254
+#: build/trans_presets.java:262
 msgid "Service"
 msgstr ""
@@ -11924,5 +11971,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:257
+#: build/trans_presets.java:265
 msgid "Edit Serviceway"
 msgstr ""
@@ -11932,18 +11979,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:261
+#: build/trans_presets.java:269
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:261
+#: build/trans_presets.java:269
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:261
+#: build/trans_presets.java:269
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:261
+#: build/trans_presets.java:269
 msgid "parking_aisle"
 msgstr ""
@@ -11951,5 +11998,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:274
+#: build/trans_presets.java:282
 msgid "Parking Aisle"
 msgstr ""
@@ -11959,5 +12006,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:278
+#: build/trans_presets.java:286
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -11965,5 +12012,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:288
+#: build/trans_presets.java:296
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -11972,5 +12019,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:291
+#: build/trans_presets.java:299
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -11979,20 +12026,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:307
+#: build/trans_presets.java:315
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:308
+#: build/trans_presets.java:316
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:310
+#: build/trans_presets.java:318
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:319
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -12005,8 +12052,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:312 build/trans_presets.java:516
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:579 build/trans_presets.java:600
-#: build/trans_presets.java:621
+#: build/trans_presets.java:320 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "Access"
 msgstr ""
@@ -12050,23 +12097,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:644
+#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:647 build/trans_presets.java:648
+#: build/trans_presets.java:649 build/trans_presets.java:1376
+#: build/trans_presets.java:2317 build/trans_presets.java:2581
 msgid "yes"
 msgstr ""
@@ -12079,40 +12126,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:192
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_style.java:203
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:644
+#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:647 build/trans_presets.java:648
+#: build/trans_presets.java:649
 msgid "designated"
 msgstr ""
@@ -12125,19 +12172,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:199
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_style.java:210
 msgid "destination"
 msgstr ""
@@ -12160,65 +12207,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:185
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_style.java:196
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:312 build/trans_presets.java:316
-#: build/trans_presets.java:319 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623
+#: build/trans_presets.java:320 build/trans_presets.java:324
+#: build/trans_presets.java:327 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
 #: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:644
+#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:647 build/trans_presets.java:648
+#: build/trans_presets.java:649 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:1314
+#: build/trans_presets.java:1376 build/trans_presets.java:2317
+#: build/trans_presets.java:2581
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:315
+#: build/trans_presets.java:323
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:316
+#: build/trans_presets.java:324
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -12233,10 +12280,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:317 build/trans_presets.java:638
-#: build/trans_presets.java:843 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:1015
+#: build/trans_presets.java:325 build/trans_presets.java:646
+#: build/trans_presets.java:851 build/trans_presets.java:884
+#: build/trans_presets.java:906 build/trans_presets.java:943
+#: build/trans_presets.java:956 build/trans_presets.java:968
+#: build/trans_presets.java:980 build/trans_presets.java:992
+#: build/trans_presets.java:1023
 msgid "Horse"
 msgstr ""
@@ -12252,13 +12299,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:318 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:844
-#: build/trans_presets.java:862 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:1016
+#: build/trans_presets.java:326 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:852
+#: build/trans_presets.java:870 build/trans_presets.java:885
+#: build/trans_presets.java:907 build/trans_presets.java:944
+#: build/trans_presets.java:957 build/trans_presets.java:969
+#: build/trans_presets.java:981 build/trans_presets.java:993
+#: build/trans_presets.java:1024
 msgid "Motorcycle"
 msgstr ""
@@ -12274,30 +12321,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:319 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: 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:1017
+#: build/trans_presets.java:327 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631 build/trans_presets.java:644
+#: build/trans_presets.java:871 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1025
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:320
+#: build/trans_presets.java:328
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:321
+#: build/trans_presets.java:329
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:322
+#: build/trans_presets.java:330
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:324
+#: build/trans_presets.java:332
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -12305,25 +12352,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:325 build/trans_presets.java:363
+#: build/trans_presets.java:333 build/trans_presets.java:371
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:326
+#: build/trans_presets.java:334
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:327
+#: build/trans_presets.java:335
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:328
+#: build/trans_presets.java:336
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:330
+#: build/trans_presets.java:338
 msgid "Roundabout"
 msgstr ""
@@ -12334,5 +12381,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:335
+#: build/trans_presets.java:343
 msgid "Edit Junction"
 msgstr ""
@@ -12354,9 +12401,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:338 build/trans_presets.java:635
-#: build/trans_presets.java:773 build/trans_presets.java:1111
-#: build/trans_presets.java:1367 build/trans_presets.java:2265
-#: build/trans_presets.java:2751 build/trans_presets.java:2761
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:346 build/trans_presets.java:643
+#: build/trans_presets.java:781 build/trans_presets.java:1119
+#: build/trans_presets.java:1375 build/trans_presets.java:2273
+#: build/trans_presets.java:2759 build/trans_presets.java:2769
+#: build/trans_presets.java:2778
 msgid "Type"
 msgstr ""
@@ -12428,10 +12475,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:516
-#: build/trans_style.java:524
+#: build/trans_presets.java:346 build/trans_style.java:527
+#: build/trans_style.java:535
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "motorway_link"
 msgstr ""
@@ -12453,10 +12500,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:346 build/trans_style.java:543
+#: build/trans_style.java:551
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "trunk_link"
 msgstr ""
@@ -12478,10 +12525,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:346 build/trans_style.java:559
+#: build/trans_style.java:567
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "primary_link"
 msgstr ""
@@ -12503,6 +12550,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:346 build/trans_style.java:575
+#: build/trans_style.java:583
 msgid "secondary"
 msgstr ""
@@ -12516,9 +12563,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:580
+#: build/trans_presets.java:346 build/trans_style.java:591
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "unclassified"
 msgstr ""
@@ -12532,9 +12579,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3095
+#: build/trans_presets.java:346 build/trans_style.java:3106
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "living_street"
 msgstr ""
@@ -12564,10 +12611,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:338 build/trans_style.java:636
-#: build/trans_style.java:4172
+#: build/trans_presets.java:346 build/trans_style.java:647
+#: build/trans_style.java:4183
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:346
 msgid "bus_guideway"
 msgstr ""
@@ -12590,6 +12637,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:839
-#: build/trans_style.java:3160 build/trans_style.java:3161
+#: build/trans_presets.java:346 build/trans_style.java:850
+#: build/trans_style.java:3171 build/trans_style.java:3172
 msgid "construction"
 msgstr ""
@@ -12600,10 +12647,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:356
+#: build/trans_presets.java:364
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:368
+#: build/trans_presets.java:376
 msgid "Edit Tunnel"
 msgstr ""
@@ -12611,19 +12658,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:382
+#: build/trans_presets.java:390
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:391
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:384
+#: build/trans_presets.java:392
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:400
+#: build/trans_presets.java:408
 msgid "Junction"
 msgstr ""
@@ -12639,5 +12686,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:857
+#: build/trans_presets.java:408 build/trans_style.java:868
 msgid "roundabout"
 msgstr ""
@@ -12646,5 +12693,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:406
+#: build/trans_presets.java:414
 msgid "Bridleway"
 msgstr ""
@@ -12652,5 +12699,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:408
+#: build/trans_presets.java:416
 msgid "Edit Bridleway"
 msgstr ""
@@ -12658,5 +12705,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:424
+#: build/trans_presets.java:432
 msgid "Cycleway"
 msgstr ""
@@ -12666,5 +12713,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:428
+#: build/trans_presets.java:436
 msgid "Edit Cycleway"
 msgstr ""
@@ -12672,5 +12719,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:444
+#: build/trans_presets.java:452
 msgid "Footway"
 msgstr ""
@@ -12679,5 +12726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:447
+#: build/trans_presets.java:455
 msgid "Edit Footway"
 msgstr ""
@@ -12685,5 +12732,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:463
+#: build/trans_presets.java:471
 msgid "Pedestrian"
 msgstr ""
@@ -12692,5 +12739,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:466
+#: build/trans_presets.java:474
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -12698,5 +12745,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:481
+#: build/trans_presets.java:489
 msgid "Steps"
 msgstr ""
@@ -12706,5 +12753,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:485
+#: build/trans_presets.java:493
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -12713,5 +12760,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:510
 msgid "Track"
 msgstr ""
@@ -12720,14 +12767,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:505
+#: build/trans_presets.java:513
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:514 build/trans_presets.java:535
+#: build/trans_presets.java:522 build/trans_presets.java:543
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:514 build/trans_presets.java:556
-#: build/trans_presets.java:577
+#: build/trans_presets.java:522 build/trans_presets.java:564
+#: build/trans_presets.java:585
 msgid "gravel"
 msgstr ""
@@ -12735,18 +12782,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:514 build/trans_presets.java:556
-#: build/trans_presets.java:577 build/trans_presets.java:598
-#: build/trans_presets.java:619
+#: build/trans_presets.java:522 build/trans_presets.java:564
+#: build/trans_presets.java:585 build/trans_presets.java:606
+#: build/trans_presets.java:627
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:514 build/trans_presets.java:598
-#: build/trans_presets.java:619
+#: build/trans_presets.java:522 build/trans_presets.java:606
+#: build/trans_presets.java:627
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:514 build/trans_presets.java:556
-#: build/trans_presets.java:577 build/trans_presets.java:598
-#: build/trans_presets.java:619
+#: build/trans_presets.java:522 build/trans_presets.java:564
+#: build/trans_presets.java:585 build/trans_presets.java:606
+#: build/trans_presets.java:627
 msgid "sand"
 msgstr ""
@@ -12754,5 +12801,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:522
+#: build/trans_presets.java:530
 msgid "Track Grade 1"
 msgstr ""
@@ -12761,5 +12808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:525
+#: build/trans_presets.java:533
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -12767,5 +12814,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:543
+#: build/trans_presets.java:551
 msgid "Track Grade 2"
 msgstr ""
@@ -12774,5 +12821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:546
+#: build/trans_presets.java:554
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -12780,5 +12827,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:564
+#: build/trans_presets.java:572
 msgid "Track Grade 3"
 msgstr ""
@@ -12787,5 +12834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:567
+#: build/trans_presets.java:575
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -12793,5 +12840,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:593
 msgid "Track Grade 4"
 msgstr ""
@@ -12800,5 +12847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:596
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -12806,5 +12853,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:606
+#: build/trans_presets.java:614
 msgid "Track Grade 5"
 msgstr ""
@@ -12813,5 +12860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:609
+#: build/trans_presets.java:617
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -12820,5 +12867,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:628
+#: build/trans_presets.java:636
 msgid "Path"
 msgstr ""
@@ -12827,13 +12874,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:639
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:637
+#: build/trans_presets.java:645
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:640
+#: build/trans_presets.java:648
 msgid "Ski"
 msgstr ""
@@ -12841,5 +12888,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:655
+#: build/trans_presets.java:663
 msgid "Hiking"
 msgstr ""
@@ -12849,5 +12896,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:667
 msgid "Edit Hiking"
 msgstr ""
@@ -12855,5 +12902,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:668
+#: build/trans_presets.java:676
 msgid "Mountain Hiking"
 msgstr ""
@@ -12863,5 +12910,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:680
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -12869,5 +12916,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:681
+#: build/trans_presets.java:689
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -12877,5 +12924,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:693
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -12883,5 +12930,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:694
+#: build/trans_presets.java:702
 msgid "Alpine Hiking"
 msgstr ""
@@ -12891,5 +12938,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:698
+#: build/trans_presets.java:706
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -12897,5 +12944,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:707
+#: build/trans_presets.java:715
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -12905,5 +12952,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:719
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -12911,5 +12958,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:720
+#: build/trans_presets.java:728
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -12919,5 +12966,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:732
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -12925,10 +12972,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:734
+#: build/trans_presets.java:742
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:743
 msgid "Motorway Junction"
 msgstr ""
@@ -12936,15 +12983,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:737
+#: build/trans_presets.java:745
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:741
+#: build/trans_presets.java:749
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:751
 msgid "Services"
 msgstr ""
@@ -12952,5 +12999,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:753
 msgid "Edit Service Station"
 msgstr ""
@@ -12985,14 +13032,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:750 build/trans_presets.java:887
-#: build/trans_presets.java:1358 build/trans_presets.java:1375
-#: build/trans_presets.java:1382 build/trans_presets.java:1388
-#: build/trans_presets.java:1396 build/trans_presets.java:1403
-#: build/trans_presets.java:2273 build/trans_presets.java:2280
-#: build/trans_presets.java:2296 build/trans_presets.java:2307
-#: build/trans_presets.java:2315 build/trans_presets.java:2322
-#: build/trans_presets.java:2372 build/trans_presets.java:2399
-#: build/trans_presets.java:2554 build/trans_presets.java:2590
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:758 build/trans_presets.java:895
+#: build/trans_presets.java:1366 build/trans_presets.java:1383
+#: build/trans_presets.java:1390 build/trans_presets.java:1396
+#: build/trans_presets.java:1404 build/trans_presets.java:1411
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2304 build/trans_presets.java:2315
+#: build/trans_presets.java:2323 build/trans_presets.java:2330
+#: build/trans_presets.java:2380 build/trans_presets.java:2407
+#: build/trans_presets.java:2562 build/trans_presets.java:2598
+#: build/trans_presets.java:3009
 msgid "Operator"
 msgstr ""
@@ -13001,5 +13048,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:754
+#: build/trans_presets.java:762
 msgid "Traffic Signal"
 msgstr ""
@@ -13009,5 +13056,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:758
+#: build/trans_presets.java:766
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13016,27 +13063,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:758 build/trans_presets.java:773
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:766 build/trans_presets.java:781
+#: build/trans_presets.java:1314
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:766 build/trans_presets.java:781
+#: build/trans_presets.java:1314
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:766 build/trans_presets.java:781
+#: build/trans_presets.java:1314
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:766 build/trans_presets.java:781
+#: build/trans_presets.java:1314
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:759 build/trans_presets.java:775
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:767 build/trans_presets.java:783
+#: build/trans_presets.java:1315
 msgid "Cross on horseback"
 msgstr ""
@@ -13044,6 +13091,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:760 build/trans_presets.java:774
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:768 build/trans_presets.java:782
+#: build/trans_presets.java:1316
 msgid "Cross by bicycle"
 msgstr ""
@@ -13052,11 +13099,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:761 build/trans_presets.java:776
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:769 build/trans_presets.java:784
+#: build/trans_presets.java:1317
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:762
+#: build/trans_presets.java:770
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13064,30 +13111,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:762 build/trans_presets.java:777
+#: build/trans_presets.java:770 build/trans_presets.java:785
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:765
+#: build/trans_presets.java:773
 msgid "Stop"
 msgstr ""
@@ -13095,5 +13142,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:768
+#: build/trans_presets.java:776
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -13102,14 +13149,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:771
+#: build/trans_presets.java:779
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:785
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:779
+#: build/trans_presets.java:787
 msgid "Mini-roundabout"
 msgstr ""
@@ -13120,14 +13167,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:784
+#: build/trans_presets.java:792
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:792
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:786
+#: build/trans_presets.java:794
 msgid "Turning Circle"
 msgstr ""
@@ -13137,20 +13184,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:791
+#: build/trans_presets.java:799
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:792
+#: build/trans_presets.java:800
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:797
+#: build/trans_presets.java:805
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:807
 msgid "Speed Camera"
 msgstr ""
@@ -13158,5 +13205,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:802
+#: build/trans_presets.java:810
 msgid "Emergency Phone"
 msgstr ""
@@ -13164,5 +13211,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:805
+#: build/trans_presets.java:813
 msgid "Incline"
 msgstr ""
@@ -13170,5 +13217,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:816
 msgid "Incline Steep"
 msgstr ""
@@ -13177,10 +13224,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:812
+#: build/trans_presets.java:820
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:813
+#: build/trans_presets.java:821
 msgid "Edit Ford"
 msgstr ""
@@ -13188,5 +13235,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:828
 msgid "Mountain Pass"
 msgstr ""
@@ -13194,5 +13241,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:822
+#: build/trans_presets.java:830
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -13204,7 +13251,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:827 build/trans_presets.java:1569
-#: build/trans_presets.java:1694 build/trans_presets.java:2695
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
+#: build/trans_presets.java:835 build/trans_presets.java:1577
+#: build/trans_presets.java:1702 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2717
 msgid "Elevation"
 msgstr ""
@@ -13212,5 +13259,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:831
+#: build/trans_presets.java:839
 msgid "Barriers"
 msgstr ""
@@ -13218,5 +13265,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:834
+#: build/trans_presets.java:842
 msgid "Bollard"
 msgstr ""
@@ -13224,5 +13271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:836
+#: build/trans_presets.java:844
 msgid "Edit Bollard"
 msgstr ""
@@ -13264,15 +13311,15 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:839 build/trans_presets.java:858
-#: build/trans_presets.java:872 build/trans_presets.java:894
-#: build/trans_presets.java:931 build/trans_presets.java:944
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1002 build/trans_presets.java:1011
+#: build/trans_presets.java:847 build/trans_presets.java:866
+#: build/trans_presets.java:880 build/trans_presets.java:902
+#: build/trans_presets.java:939 build/trans_presets.java:952
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1010 build/trans_presets.java:1019
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:846
+#: build/trans_presets.java:854
 msgid "Cycle Barrier"
 msgstr ""
@@ -13281,5 +13328,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:850
+#: build/trans_presets.java:858
 msgid "Block"
 msgstr ""
@@ -13287,5 +13334,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:861
 msgid "Cattle Grid"
 msgstr ""
@@ -13293,10 +13340,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:855
+#: build/trans_presets.java:863
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:873
 msgid "Bus Trap"
 msgstr ""
@@ -13304,15 +13351,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:876
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:869
+#: build/trans_presets.java:877
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:888
 msgid "Toll Booth"
 msgstr ""
@@ -13320,5 +13367,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:882
+#: build/trans_presets.java:890
 msgid "Edit Toll Booth"
 msgstr ""
@@ -13326,10 +13373,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:890
+#: build/trans_presets.java:898
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:891
+#: build/trans_presets.java:899
 msgid "Edit Border Control"
 msgstr ""
@@ -13339,5 +13386,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:905
+#: build/trans_presets.java:913
 msgid "Hedge"
 msgstr ""
@@ -13346,5 +13393,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:917
 msgid "Fence"
 msgstr ""
@@ -13353,5 +13400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:913
+#: build/trans_presets.java:921
 msgid "Wall"
 msgstr ""
@@ -13359,5 +13406,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:916
+#: build/trans_presets.java:924
 msgid "City Wall"
 msgstr ""
@@ -13366,5 +13413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:920
+#: build/trans_presets.java:928
 msgid "Retaining Wall"
 msgstr ""
@@ -13376,15 +13423,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:927
+#: build/trans_presets.java:935
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:928
+#: build/trans_presets.java:936
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:939
+#: build/trans_presets.java:947
 msgid "Gate"
 msgstr ""
@@ -13392,50 +13439,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:941
+#: build/trans_presets.java:949
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:960
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:953
+#: build/trans_presets.java:961
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:964
+#: build/trans_presets.java:972
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:965
+#: build/trans_presets.java:973
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:984
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:977
+#: build/trans_presets.java:985
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:996
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:989
+#: build/trans_presets.java:997
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1005
 msgid "Stile"
 msgstr ""
@@ -13443,15 +13490,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1007
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1015
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1008
+#: build/trans_presets.java:1016
 msgid "Edit Sally Port"
 msgstr ""
@@ -13462,10 +13509,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1022 build/trans_presets.java:1065
+#: build/trans_presets.java:1030 build/trans_presets.java:1073
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1031
 msgid "Spring"
 msgstr ""
@@ -13473,5 +13520,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:1033
 msgid "Edit Spring"
 msgstr ""
@@ -13479,5 +13526,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1030
+#: build/trans_presets.java:1038
 msgid "Drain"
 msgstr ""
@@ -13485,10 +13532,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1040
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1046
 msgid "Stream"
 msgstr ""
@@ -13496,10 +13543,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1048
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1054
 msgid "Canal"
 msgstr ""
@@ -13507,10 +13554,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1056
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1062
 msgid "River"
 msgstr ""
@@ -13520,5 +13567,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1066
 msgid "Edit River"
 msgstr ""
@@ -13526,15 +13573,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1075
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1071
+#: build/trans_presets.java:1079
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1080
 msgid "Edit Land"
 msgstr ""
@@ -13542,15 +13589,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1085
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1086
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:1091
 msgid "Reservoir"
 msgstr ""
@@ -13558,15 +13605,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1093
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1090
+#: build/trans_presets.java:1098
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1099
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -13574,5 +13621,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1104
 msgid "Riverbank"
 msgstr ""
@@ -13581,10 +13628,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1107
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1111
 msgid "Wetland"
 msgstr ""
@@ -13595,14 +13642,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1116
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "bog"
 msgstr ""
@@ -13616,35 +13663,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3336
+#: build/trans_presets.java:1119 build/trans_style.java:3347
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1119
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1121
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1122
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1126
 msgid "Beach"
 msgstr ""
@@ -13652,20 +13699,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1128
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1132
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1133
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1137
 msgid "Cliff"
 msgstr ""
@@ -13673,10 +13720,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1139
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1143
 msgid "Coastline"
 msgstr ""
@@ -13684,5 +13731,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1145
 msgid "Edit Coastline"
 msgstr ""
@@ -13690,5 +13737,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1150
 msgid "Ferry Route"
 msgstr ""
@@ -13696,5 +13743,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1152
 msgid "Edit Ferry"
 msgstr ""
@@ -13703,5 +13750,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1160
 msgid "Boatyard"
 msgstr ""
@@ -13709,10 +13756,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1162
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1167
 msgid "Dock"
 msgstr ""
@@ -13720,5 +13767,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1169
 msgid "Edit Dock"
 msgstr ""
@@ -13726,5 +13773,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1175
 msgid "Dam"
 msgstr ""
@@ -13732,15 +13779,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1177
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1183
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1184
 msgid "Lock Gate"
 msgstr ""
@@ -13749,5 +13796,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1188
 msgid "Weir"
 msgstr ""
@@ -13755,20 +13802,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1182
+#: build/trans_presets.java:1190
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1195
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1196
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1201
 msgid "Turning Point"
 msgstr ""
@@ -13777,15 +13824,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1205
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1206
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1210
 msgid "Pier"
 msgstr ""
@@ -13793,10 +13840,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1212
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1216
 msgid "Ferry Terminal"
 msgstr ""
@@ -13804,10 +13851,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1218
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1222
 msgid "Slipway"
 msgstr ""
@@ -13817,5 +13864,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1226
 msgid "Edit Slipway"
 msgstr ""
@@ -13823,10 +13870,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1232
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1233
 msgid "Rail"
 msgstr ""
@@ -13834,5 +13881,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1235
 msgid "Edit Rail"
 msgstr ""
@@ -13862,8 +13909,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1255 build/trans_presets.java:1261
-#: build/trans_presets.java:1267 build/trans_presets.java:1292
+#: build/trans_presets.java:1238 build/trans_presets.java:1244
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1269
+#: build/trans_presets.java:1275 build/trans_presets.java:1300
 msgid "Optional Types"
 msgstr ""
@@ -13877,35 +13924,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1255 build/trans_presets.java:1261
-#: build/trans_presets.java:1267 build/trans_presets.java:1292
+#: build/trans_presets.java:1238 build/trans_presets.java:1244
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1269
+#: build/trans_presets.java:1275 build/trans_presets.java:1300
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1255 build/trans_presets.java:1261
-#: build/trans_presets.java:1267 build/trans_presets.java:1292
+#: build/trans_presets.java:1238 build/trans_presets.java:1244
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1269
+#: build/trans_presets.java:1275 build/trans_presets.java:1300
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1255 build/trans_presets.java:1261
-#: build/trans_presets.java:1267 build/trans_presets.java:1292
+#: build/trans_presets.java:1238 build/trans_presets.java:1244
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1269
+#: build/trans_presets.java:1275 build/trans_presets.java:1300
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1240
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1241
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1246
 msgid "Monorail"
 msgstr ""
@@ -13913,45 +13960,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1248
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1253
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1254
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1259
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:1260
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1265
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1266
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1271
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1272
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1277
 msgid "Bus Guideway"
 msgstr ""
@@ -13959,5 +14006,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1279
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -13966,14 +14013,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1296
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1297
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1302
 msgid "Abandoned Rail"
 msgstr ""
@@ -13982,5 +14029,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1306
 msgid "Level Crossing"
 msgstr ""
@@ -13989,5 +14036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1310
 msgid "Crossing"
 msgstr ""
@@ -13997,5 +14044,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1314
 msgid "Crossing type"
 msgstr ""
@@ -14003,5 +14050,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1320
 msgid "Turntable"
 msgstr ""
@@ -14010,10 +14057,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1325
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1326
 msgid "Chair Lift"
 msgstr ""
@@ -14021,10 +14068,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1328
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1332
 msgid "Drag Lift"
 msgstr ""
@@ -14032,10 +14079,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1334
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1338
 msgid "Cable Car"
 msgstr ""
@@ -14043,10 +14090,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1340
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1344
 msgid "Gondola"
 msgstr ""
@@ -14054,5 +14101,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1346
 msgid "Edit Gondola"
 msgstr ""
@@ -14060,5 +14107,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1342 build/trans_presets.java:1430
+#: build/trans_presets.java:1350 build/trans_presets.java:1438
 msgid "Station"
 msgstr ""
@@ -14069,10 +14116,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1344 build/trans_presets.java:1433
+#: build/trans_presets.java:1352 build/trans_presets.java:1441
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1359
 msgid "Fuel"
 msgstr ""
@@ -14082,5 +14129,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1363
 msgid "Edit Fuel"
 msgstr ""
@@ -14096,5 +14143,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1360 build/trans_presets.java:1407
+#: build/trans_presets.java:1368 build/trans_presets.java:1415
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -14104,5 +14151,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1371
 msgid "Edit Parking"
 msgstr ""
@@ -14110,41 +14157,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1366 build/trans_presets.java:1412
+#: build/trans_presets.java:1374 build/trans_presets.java:1420
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1375
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1375
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1375
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1375
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1376
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1369 build/trans_presets.java:2309
+#: build/trans_presets.java:1377 build/trans_presets.java:2317
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1379
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1380
 msgid "Edit Car Wash"
 msgstr ""
@@ -14152,5 +14199,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1377 build/trans_presets.java:1421
+#: build/trans_presets.java:1385 build/trans_presets.java:1429
 msgid "Shop"
 msgstr ""
@@ -14158,15 +14205,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1387
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1392
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1393
 msgid "Edit Car Repair"
 msgstr ""
@@ -14174,5 +14221,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1398 build/trans_presets.java:1422
 msgid "Rental"
 msgstr ""
@@ -14181,10 +14228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1401
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1406
 msgid "Sharing"
 msgstr ""
@@ -14192,5 +14239,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1408
 msgid "Edit Car Sharing"
 msgstr ""
@@ -14198,5 +14245,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1417
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -14205,5 +14252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1425
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -14212,15 +14259,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1432
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1437
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1446
 msgid "UIC-Reference"
 msgstr ""
@@ -14228,5 +14275,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1449
 msgid "Railway Halt"
 msgstr ""
@@ -14234,5 +14281,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1451
 msgid "Edit Halt"
 msgstr ""
@@ -14240,5 +14287,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1458
 msgid "Tram Stop"
 msgstr ""
@@ -14247,5 +14294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1461
 msgid "Edit Tram Stop"
 msgstr ""
@@ -14253,5 +14300,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1468
 msgid "Railway Platform"
 msgstr ""
@@ -14260,5 +14307,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1471
 msgid "Edit Railway Platform"
 msgstr ""
@@ -14270,5 +14317,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1466 build/trans_presets.java:1508
+#: build/trans_presets.java:1474 build/trans_presets.java:1516
 msgid "Reference (track number)"
 msgstr ""
@@ -14276,10 +14323,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1468 build/trans_presets.java:1510
+#: build/trans_presets.java:1476 build/trans_presets.java:1518
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1470
+#: build/trans_presets.java:1478
 msgid "Subway Entrance"
 msgstr ""
@@ -14288,10 +14335,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1481
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1486
 msgid "Wheelchair"
 msgstr ""
@@ -14300,5 +14347,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1483
+#: build/trans_presets.java:1491
 msgid "Bus Station"
 msgstr ""
@@ -14307,5 +14354,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1494
 msgid "Edit Bus Station"
 msgstr ""
@@ -14313,5 +14360,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1492
+#: build/trans_presets.java:1500
 msgid "Bus Stop"
 msgstr ""
@@ -14321,5 +14368,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1504
 msgid "Edit Bus Stop"
 msgstr ""
@@ -14330,6 +14377,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1501 build/trans_presets.java:1703
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:1509 build/trans_presets.java:1711
+#: build/trans_presets.java:2357
 msgid "Shelter"
 msgstr ""
@@ -14337,10 +14384,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1512
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1513
 msgid "Edit Bus Platform"
 msgstr ""
@@ -14348,5 +14395,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1521
 msgid "Taxi"
 msgstr ""
@@ -14354,5 +14401,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1523
 msgid "Edit Taxi station"
 msgstr ""
@@ -14360,5 +14407,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1528
 msgid "Airport"
 msgstr ""
@@ -14366,15 +14413,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1530
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1535
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1536
 msgid "ICAO"
 msgstr ""
@@ -14383,5 +14430,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1541
 msgid "Accomodation"
 msgstr ""
@@ -14393,5 +14440,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1534 build/trans_surveyor.java:43
+#: build/trans_presets.java:1542 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -14400,15 +14447,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1545
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1548
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1550
 msgid "Motel"
 msgstr ""
@@ -14416,20 +14463,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1552
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1556
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1557
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1561
 msgid "Chalet"
 msgstr ""
@@ -14437,10 +14484,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1563
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1567
 msgid "Hostel"
 msgstr ""
@@ -14448,30 +14495,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1569
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1573
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1574
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1579
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1580
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1584
 msgid "Camping Site"
 msgstr ""
@@ -14479,10 +14526,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1586
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1583
+#: build/trans_presets.java:1591
 msgid "Food+Drinks"
 msgstr ""
@@ -14493,5 +14540,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1584 build/trans_surveyor.java:47
+#: build/trans_presets.java:1592 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -14499,5 +14546,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1594
 msgid "Edit Restaurant"
 msgstr ""
@@ -14505,5 +14552,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "Cuisine"
 msgstr ""
@@ -14511,61 +14558,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1589 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1604
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1599
 msgid "Fast Food"
 msgstr ""
@@ -14573,9 +14620,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1601
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1606
 msgid "Cafe"
 msgstr ""
@@ -14583,10 +14630,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1608
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1612
 msgid "Pub"
 msgstr ""
@@ -14594,20 +14641,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1614
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1618
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1619
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1623
 msgid "Bar"
 msgstr ""
@@ -14615,10 +14662,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1625
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1629
 msgid "Nightclub"
 msgstr ""
@@ -14626,20 +14673,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1631
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1636
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1637
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1638
 msgid "Edit Attraction"
 msgstr ""
@@ -14648,11 +14695,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1633 build/trans_presets.java:1673
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:1641 build/trans_presets.java:1681
+#: build/trans_presets.java:2381
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "Museum"
 msgstr ""
@@ -14660,10 +14707,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1645
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1649
 msgid "Zoo"
 msgstr ""
@@ -14672,10 +14719,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1652
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1656
 msgid "Viewpoint"
 msgstr ""
@@ -14683,25 +14730,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1658
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1661
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1663
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1664
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1668
 msgid "Artwork"
 msgstr ""
@@ -14709,5 +14756,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1670
 msgid "Edit Artwork"
 msgstr ""
@@ -14715,5 +14762,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1675
 msgid "Information Office"
 msgstr ""
@@ -14721,80 +14768,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1677
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1683
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1687
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1687
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1687
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1687
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1687
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1680 build/trans_presets.java:1687
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1708
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1690
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1694
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1694
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1694
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1694
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1694
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1704
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1712
 msgid "Edit Shelter"
 msgstr ""
@@ -14802,25 +14849,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1707 build/trans_presets.java:1713
+#: build/trans_presets.java:1715 build/trans_presets.java:1721
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1717
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1718
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1724
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1725
 msgid "Castle"
 msgstr ""
@@ -14829,20 +14876,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1728
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1732
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1733
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1737
 msgid "Archaeological Site"
 msgstr ""
@@ -14851,10 +14898,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1740
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1744
 msgid "Battlefield"
 msgstr ""
@@ -14862,5 +14909,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1746
 msgid "Edit Battlefield"
 msgstr ""
@@ -14868,15 +14915,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1751
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1752
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1756
 msgid "Memorial"
 msgstr ""
@@ -14884,45 +14931,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1750
+#: build/trans_presets.java:1758
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1762
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1763
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1767
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1768
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1773
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1774
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1775
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1779
 msgid "Playground"
 msgstr ""
@@ -14930,15 +14977,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1781
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1785
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1786
 msgid "Edit Fishing"
 msgstr ""
@@ -14946,15 +14993,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1792
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1793
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1794
 msgid "Edit Stadium"
 msgstr ""
@@ -14968,6 +15015,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1798 build/trans_presets.java:1807
+#: build/trans_presets.java:1816 build/trans_presets.java:1825
 msgid "select sport:"
 msgstr ""
@@ -15343,29 +15390,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3516 build/trans_style.java:3524
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3543 build/trans_style.java:3551
+#: build/trans_style.java:3559 build/trans_style.java:3567
+#: build/trans_style.java:3575 build/trans_style.java:3583
+#: build/trans_style.java:3591 build/trans_style.java:3599
+#: build/trans_style.java:3607 build/trans_style.java:3615
+#: build/trans_style.java:3623 build/trans_style.java:3631
+#: build/trans_style.java:3639 build/trans_style.java:3647
+#: build/trans_style.java:3655 build/trans_style.java:3663
+#: build/trans_style.java:3671 build/trans_style.java:3679
+#: build/trans_style.java:3687 build/trans_style.java:3695
+#: build/trans_style.java:3703 build/trans_style.java:3711
+#: build/trans_style.java:3719 build/trans_style.java:3727
+#: build/trans_style.java:3735 build/trans_style.java:3743
+#: build/trans_style.java:3751 build/trans_style.java:3759
+#: build/trans_style.java:3767 build/trans_style.java:3775
+#: build/trans_style.java:3783 build/trans_style.java:3791
+#: build/trans_style.java:3799 build/trans_style.java:3807
+#: build/trans_style.java:3815 build/trans_style.java:3823
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879
 msgid "sport"
 msgstr ""
@@ -15375,227 +15422,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1792 build/trans_presets.java:1801
-#: build/trans_presets.java:1810 build/trans_presets.java:1819
+#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1818 build/trans_presets.java:1827
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1802
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1803
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1811
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1812
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1820
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1821
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1829
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1830
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1834
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1835
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1840
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1841
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1842
 msgid "Edit Multi"
 msgstr ""
@@ -15634,191 +15681,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:1845 build/trans_presets.java:1851
+#: build/trans_presets.java:1857 build/trans_presets.java:1863
+#: build/trans_presets.java:1869 build/trans_presets.java:1875
+#: build/trans_presets.java:1881 build/trans_presets.java:1887
+#: build/trans_presets.java:1893 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1911
+#: build/trans_presets.java:1917 build/trans_presets.java:1923
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1945 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:1845 build/trans_presets.java:1851
+#: build/trans_presets.java:1857 build/trans_presets.java:1863
+#: build/trans_presets.java:1869 build/trans_presets.java:1875
+#: build/trans_presets.java:1881 build/trans_presets.java:1887
+#: build/trans_presets.java:1893 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1911
+#: build/trans_presets.java:1917 build/trans_presets.java:1923
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1945 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:1845 build/trans_presets.java:1851
+#: build/trans_presets.java:1857 build/trans_presets.java:1863
+#: build/trans_presets.java:1869 build/trans_presets.java:1875
+#: build/trans_presets.java:1881 build/trans_presets.java:1887
+#: build/trans_presets.java:1893 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1911
+#: build/trans_presets.java:1917 build/trans_presets.java:1923
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1945 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1847
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1848
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1853
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1846
+#: build/trans_presets.java:1854
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1859
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1860
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1865
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1866
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1871
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1872
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1877
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1878
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1883
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1884
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1889
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1890
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1895
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1896
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1901
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1902
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1907
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1908
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1913
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1914
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1919
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1920
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1925
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1926
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1931
 msgid "Skiing"
 msgstr ""
@@ -15826,56 +15873,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1933
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1936
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1936
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1936
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1936
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1937
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1940
 msgid "Shooting"
 msgstr ""
@@ -15883,178 +15930,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1942
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1948
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1949
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1950
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1955
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1956
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1961
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1962
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1967
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1968
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1973
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1974
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1979
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1980
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1983
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1985
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1986
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1991
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1992
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1997
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1998
 msgid "Edit Cricket"
 msgstr "Redihgeeri kriket"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2003
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:2004
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2009
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2010
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2015
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2016
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2021
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2022
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2027
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2028
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2033
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2034
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2039
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2040
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2045
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2046
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Buildings"
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2054
 msgid "Building"
 msgstr "Ehirus"
@@ -16062,5 +16109,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2057
 msgid "Public Building"
 msgstr ""
@@ -16068,10 +16115,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2059
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2063
 msgid "Town hall"
 msgstr "Linna hall"
@@ -16079,10 +16126,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2065
 msgid "Edit Town hall"
 msgstr "Vali linna hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2069
 msgid "Embassy"
 msgstr "Saatkond"
@@ -16090,10 +16137,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2071
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2075
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -16102,10 +16149,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2078
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2082
 msgid "Prison"
 msgstr "Vangla"
@@ -16114,10 +16161,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2085
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2089
 msgid "Police"
 msgstr "Politsei"
@@ -16127,10 +16174,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2093
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2097
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -16139,10 +16186,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2100
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2104
 msgid "Post Office"
 msgstr ""
@@ -16150,5 +16197,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2106
 msgid "Edit Post Office"
 msgstr ""
@@ -16156,15 +16203,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2111
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2112
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2116
 msgid "School"
 msgstr "Kool"
@@ -16172,10 +16219,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2118
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2122
 msgid "University"
 msgstr "Ülikool"
@@ -16183,10 +16230,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2124
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2128
 msgid "College"
 msgstr "Kolledž"
@@ -16194,5 +16241,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2130
 msgid "Edit College"
 msgstr "Vale kolledž"
@@ -16200,5 +16247,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2135
 msgid "Cinema"
 msgstr "Kino"
@@ -16207,10 +16254,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2138
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2142
 msgid "Library"
 msgstr "Raamatukogu"
@@ -16219,10 +16266,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2145
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2149
 msgid "Arts Centre"
 msgstr ""
@@ -16230,10 +16277,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2151
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2155
 msgid "Theatre"
 msgstr "Teater"
@@ -16242,10 +16289,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2150
+#: build/trans_presets.java:2158
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2162
 msgid "Place of Worship"
 msgstr ""
@@ -16255,5 +16302,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2166
 msgid "Edit Place of Worship"
 msgstr ""
@@ -16262,6 +16309,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "Religion"
 msgstr "Religioon"
@@ -16270,66 +16317,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2169 build/trans_presets.java:2890
+#: build/trans_presets.java:2899
 msgid "zoroastrian"
 msgstr "zoroastrism (muinaspärslaste usund)"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -16338,81 +16385,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "jehovahs_witness"
 msgstr "jehoova_tunnistajad"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2162 build/trans_presets.java:2883
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2170 build/trans_presets.java:2891
+#: build/trans_presets.java:2900
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2173
 msgid "Addresses"
 msgstr "Aadressid"
@@ -16421,5 +16468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2176
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -16427,5 +16474,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2178
 msgid "House number"
 msgstr "Maja number"
@@ -16433,20 +16480,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2180
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2182
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2183
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2184
 msgid "Country code"
 msgstr "Riigi kood"
@@ -16454,5 +16501,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2187
 msgid "Address Interpolation"
 msgstr ""
@@ -16461,5 +16508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2190
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -16467,71 +16514,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2192
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2192
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2192
 msgid "even"
 msgstr "tasane"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2192
 msgid "all"
 msgstr "kõik"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2192
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2195
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2196
 msgid "Works"
 msgstr "Töökojad"
 
 #. item
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2197
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2201
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2202
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2206
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2207
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2211
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2212
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2216
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -16539,10 +16586,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2218
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2222
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -16550,10 +16597,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2224
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2228
 msgid "Pipeline"
 msgstr "Torustik"
@@ -16561,10 +16608,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2230
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2234
 msgid "Wastewater Plant"
 msgstr ""
@@ -16574,10 +16621,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2238
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2242
 msgid "Crane"
 msgstr "Kraana"
@@ -16585,10 +16632,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2244
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2248
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -16596,10 +16643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2250
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2254
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -16607,10 +16654,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2256
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2260
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -16618,5 +16665,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2262
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
@@ -16624,5 +16671,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2267
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -16632,39 +16679,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2271
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "hydro"
 msgstr "vesi"
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "nuclear"
 msgstr "aatom"
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2273
 msgid "gas"
 msgstr "gaas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2276
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -16673,10 +16720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2279
 msgid "Edit Power Station"
 msgstr "Vali eliektrijaam"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2283
 msgid "Power Sub Station"
 msgstr "Elektri alajaam"
@@ -16685,5 +16732,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2286
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -16691,10 +16738,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2281 build/trans_presets.java:2297
+#: build/trans_presets.java:2289 build/trans_presets.java:2305
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2291
 msgid "Power Tower"
 msgstr ""
@@ -16705,5 +16752,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2296
 msgid "Edit Power Tower"
 msgstr ""
@@ -16711,5 +16758,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2299
 msgid "Power Line"
 msgstr ""
@@ -16718,25 +16765,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2302
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2306
 msgid "Voltage"
 msgstr "Pinge"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2307
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2310
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2311
 msgid "Toilets"
 msgstr "Tualetid"
@@ -16744,20 +16791,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2308 build/trans_presets.java:2400
+#: build/trans_presets.java:2316 build/trans_presets.java:2408
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2310 build/trans_presets.java:2401
+#: build/trans_presets.java:2318 build/trans_presets.java:2409
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2320
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2325
 msgid "Telephone"
 msgstr "Telefon"
@@ -16766,5 +16813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2328
 msgid "Edit Telephone"
 msgstr ""
@@ -16772,5 +16819,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2331 build/trans_presets.java:2410
 msgid "Coins"
 msgstr "Mündid"
@@ -16778,5 +16825,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2332 build/trans_presets.java:2411
 msgid "Notes"
 msgstr "Märkused"
@@ -16784,5 +16831,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2333 build/trans_presets.java:2412
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -16790,5 +16837,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2326 build/trans_presets.java:2405
+#: build/trans_presets.java:2334 build/trans_presets.java:2413
 msgid "Debit cards"
 msgstr "Debet kaart"
@@ -16796,15 +16843,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2327 build/trans_presets.java:2406
+#: build/trans_presets.java:2335 build/trans_presets.java:2414
 msgid "Credit cards"
 msgstr "Krediit kaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2336
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2338
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -16813,5 +16860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2341
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -16819,35 +16866,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2343
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2344
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2345
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2346
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2347
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2348
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2350
 msgid "Bench"
 msgstr ""
@@ -16856,20 +16903,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2354
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2355
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2358
 msgid "Hide"
 msgstr "Peida"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2359
 msgid "Lock"
 msgstr "Lukusta"
@@ -16877,22 +16924,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2352 build/trans_presets.java:2752
+#: build/trans_presets.java:2360 build/trans_presets.java:2760
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2360
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2360
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2360
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2362
 msgid "Fountain"
 msgstr "Purskaev"
@@ -16901,10 +16948,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:2365
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2369
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -16913,10 +16960,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "Edit Drinking Water"
 msgstr "Vali joogi vee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2376
 msgid "Baby Hatch"
 msgstr ""
@@ -16924,25 +16971,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2378
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2384
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2385
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2386
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2390
 msgid "Convenience Store"
 msgstr ""
@@ -16950,10 +16997,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2392
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2396
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16961,10 +17008,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2398
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2402
 msgid "Vending machine"
 msgstr ""
@@ -16972,5 +17019,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2404
 msgid "Edit Vending machine"
 msgstr ""
@@ -16978,88 +17025,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "condoms"
 msgstr "ckondoomid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2406
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2415
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2417
 msgid "Butcher"
 msgstr "Lihunik"
@@ -17067,10 +17114,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2419
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2423
 msgid "Baker"
 msgstr "Pagar"
@@ -17078,10 +17125,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2425
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2429
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -17089,20 +17136,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2431
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2435
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2436
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2440
 msgid "Alcohol"
 msgstr ""
@@ -17110,60 +17157,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2442
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2446
 msgid "Beverages"
 msgstr "Joogi pood"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2447
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2451
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2452
 msgid "Edit Computer Shop"
 msgstr "Vali arvuti pood"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2456
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2457
 msgid "Edit Electronics Shop"
 msgstr "Vali elktroonika pood"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2461
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2462
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2466
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2467
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2471
 msgid "Garden Centre"
 msgstr "Aia keskus"
@@ -17171,10 +17218,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2473
 msgid "Edit Garden Centre"
 msgstr "Vali aia keskus"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2477
 msgid "Hardware"
 msgstr "Riistvara"
@@ -17182,10 +17229,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2479
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2483
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -17193,60 +17240,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2485
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2489
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2490
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2494
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2495
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2499
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2500
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2504
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2505
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2509
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2510
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2514
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -17254,10 +17301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2516
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2520
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -17265,10 +17312,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2522
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2526
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -17276,35 +17323,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2528
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2532
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2533
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2537
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2538
 msgid "Edit Optician"
 msgstr "Vali optika"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2544
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2545
 msgid "Bank"
 msgstr "Pank"
@@ -17312,5 +17359,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2547
 msgid "Edit Bank"
 msgstr "Vali Pank"
@@ -17318,10 +17365,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2542 build/trans_presets.java:2550
+#: build/trans_presets.java:2550 build/trans_presets.java:2558
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2552
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -17329,5 +17376,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2554
 msgid "Edit Money Exchange"
 msgstr "Vali raha vahetus punkt"
@@ -17335,15 +17382,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2560
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2566
 msgid "Doctors"
 msgstr "Arstid"
@@ -17351,20 +17398,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2568
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2572
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2573
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2577
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -17372,5 +17419,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2579
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -17378,10 +17425,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2581
 msgid "Dispensing"
 msgstr "Retseptuur"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2584
 msgid "Hospital"
 msgstr "Haigla"
@@ -17389,10 +17436,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2586
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2590
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -17401,5 +17448,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2593
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -17408,20 +17455,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2596
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2597
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2599
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2600
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -17429,5 +17476,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2603
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -17436,25 +17483,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2606
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
 #. group "Places"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2613
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2614
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2619
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2620
 msgid "Edit Country"
 msgstr "Vali maa"
@@ -17462,30 +17509,30 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2617 build/trans_presets.java:3002
+#: build/trans_presets.java:2625 build/trans_presets.java:3010
 msgid "State"
 msgstr "Riik"
 
 #. item
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2626
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2631
 msgid "Region"
 msgstr "Regioon"
 
 #. item
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2632
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2637
 msgid "County"
 msgstr "Maakond"
 
 #. item
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2638
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -17493,15 +17540,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2644
 msgid "City"
 msgstr "Linn"
 
 #. item
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2645
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2650
 msgid "Town"
 msgstr "Linn"
@@ -17509,10 +17556,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2652
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2657
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -17520,25 +17567,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2659
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2664
 msgid "Village"
 msgstr "Küla"
 
 #. item
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2665
 msgid "Edit Village"
 msgstr "Muuda küla"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2670
 msgid "Hamlet"
 msgstr "Külake"
 
 #. item
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2671
 msgid "Edit Hamlet"
 msgstr "Muuda külakest"
@@ -17546,5 +17593,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2677
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -17552,10 +17599,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2679
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2684
 msgid "Island"
 msgstr "Saar"
@@ -17563,5 +17610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2686
 msgid "Edit Island"
 msgstr "Muuda saart"
@@ -17569,5 +17616,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2692
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -17575,10 +17622,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2694
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2698
 msgid "Peak"
 msgstr "Mäetipp"
@@ -17586,10 +17633,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2700
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2705
 msgid "Glacier"
 msgstr "Liustik"
@@ -17597,10 +17644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2707
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2712
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -17608,70 +17655,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2714
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2720
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2721
 msgid "National"
 msgstr "Riiklikud"
 
 #. item
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2722
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2727
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2728
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2733
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2734
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2739
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2740
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2745
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2746
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2752
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2753
 msgid "Tree"
 msgstr "Üksik puu"
@@ -17680,15 +17727,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2756
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2761
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2763
 msgid "Wood"
 msgstr "Mets"
@@ -17697,5 +17744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2766
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -17703,17 +17750,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2769 build/trans_presets.java:2778
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2769 build/trans_presets.java:2778
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2769 build/trans_presets.java:2778
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2771
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -17722,14 +17769,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2774
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2780
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2781
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -17737,25 +17784,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2786
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2787
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2791
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2792
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2796
 msgid "Fell"
 msgstr "Langus"
@@ -17763,10 +17810,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2798
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2802
 msgid "Heath"
 msgstr "Nõmm"
@@ -17774,5 +17821,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2804
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -17780,5 +17827,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2809
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -17787,45 +17834,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2812
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2817
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2818
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2823
 msgid "Meadow"
 msgstr "Niit"
 
 #. item
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2824
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2829
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2830
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2835
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2836
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -17833,25 +17880,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2842
 msgid "Garden"
 msgstr "Aed"
 
 #. item
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2843
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2847
 msgid "Grass"
 msgstr "Muru"
 
 #. item
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2848
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2853
 msgid "Village Green"
 msgstr "Külatanum"
@@ -17859,10 +17906,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2855
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2860
 msgid "Common"
 msgstr "Avalik maa"
@@ -17870,20 +17917,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2862
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2866
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2867
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2871
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -17891,5 +17938,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2873
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -17897,15 +17944,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2879
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2880
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2885
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -17913,9 +17960,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2887
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2893
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -17923,39 +17970,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2895
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2902
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2903
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2908
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2909
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2914
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2915
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2920
 msgid "Railway land"
 msgstr "Raudtee"
@@ -17963,15 +18010,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2922
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2927
 msgid "Military"
 msgstr "Militaarala"
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2928
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -17979,55 +18026,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2934
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2935
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2940
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2941
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2946
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2947
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2952
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2953
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2958
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2959
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
 
 #. group "Relations"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2968
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -18037,5 +18084,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -18044,10 +18091,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2978
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "inner segment"
 msgstr "siseosa"
@@ -18055,5 +18102,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2982
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -18062,5 +18109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2985
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -18068,34 +18115,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -18104,15 +18151,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2994
 msgid "to way"
 msgstr "teele"
@@ -18120,5 +18167,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "Route"
 msgstr "Teekond"
@@ -18127,5 +18174,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3000
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -18133,5 +18180,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -18203,24 +18250,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:213
-#: build/trans_style.java:652 build/trans_style.java:868
-#: build/trans_style.java:876 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
+#: build/trans_presets.java:3002 build/trans_style.java:224
+#: build/trans_style.java:663 build/trans_style.java:879
+#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_style.java:903 build/trans_style.java:911
 msgid "bicycle"
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "ski"
 msgstr "suusad"
@@ -18273,20 +18320,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:227
-#: build/trans_style.java:660 build/trans_style.java:668
-#: build/trans_style.java:676 build/trans_style.java:677
-#: build/trans_style.java:685
+#: build/trans_presets.java:3002 build/trans_style.java:238
+#: build/trans_style.java:671 build/trans_style.java:679
+#: build/trans_style.java:687 build/trans_style.java:688
+#: build/trans_style.java:696
 msgid "foot"
 msgstr "jalgsi"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "detour"
 msgstr "ümbersõit"
@@ -18300,10 +18347,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1168
+#: build/trans_presets.java:3002 build/trans_style.java:1179
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -18311,26 +18358,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3008
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3010
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3010
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3010
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3010
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3011
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -18339,30 +18386,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3014
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3015
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3016
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3017
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3018
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3019
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -18417,7 +18464,18 @@
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
 #. -->
 #.
-#: build/trans_style.java:52
+#: build/trans_style.java:63
 msgid "standard"
 msgstr "standard"
@@ -18511,7 +18569,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:112 build/trans_style.java:126
-#: build/trans_style.java:133 build/trans_style.java:140
-#: build/trans_style.java:147
+#: build/trans_style.java:123 build/trans_style.java:137
+#: build/trans_style.java:144 build/trans_style.java:151
+#: build/trans_style.java:158
 msgid "bridge"
 msgstr "sild"
@@ -18776,15 +18834,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:119 build/trans_style.java:154
-#: build/trans_style.java:161 build/trans_style.java:168
-#: build/trans_style.java:596 build/trans_style.java:793
-#: build/trans_style.java:1118 build/trans_style.java:2375
-#: build/trans_style.java:3327 build/trans_style.java:3328
-#: build/trans_style.java:3882 build/trans_style.java:4182
-#: build/trans_style.java:4191 build/trans_style.java:4200
-#: build/trans_style.java:4209 build/trans_style.java:4218
-#: build/trans_style.java:4227 build/trans_style.java:4236
-#: build/trans_style.java:4237 build/trans_style.java:4246
-#: build/trans_style.java:4255
+#: build/trans_style.java:130 build/trans_style.java:165
+#: build/trans_style.java:172 build/trans_style.java:179
+#: build/trans_style.java:607 build/trans_style.java:804
+#: build/trans_style.java:1129 build/trans_style.java:2386
+#: build/trans_style.java:3338 build/trans_style.java:3339
+#: build/trans_style.java:3893 build/trans_style.java:4193
+#: build/trans_style.java:4202 build/trans_style.java:4211
+#: build/trans_style.java:4220 build/trans_style.java:4229
+#: build/trans_style.java:4238 build/trans_style.java:4247
+#: build/trans_style.java:4248 build/trans_style.java:4257
+#: build/trans_style.java:4266
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -18826,5 +18884,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:255 build/trans_style.java:644
+#: build/trans_style.java:266 build/trans_style.java:655
 msgid "horse"
 msgstr "hobused"
@@ -19034,11 +19092,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:362 build/trans_style.java:375
-#: build/trans_style.java:376 build/trans_style.java:389
-#: build/trans_style.java:390 build/trans_style.java:409
-#: build/trans_style.java:410 build/trans_style.java:417
-#: build/trans_style.java:430 build/trans_style.java:431
-#: build/trans_style.java:444 build/trans_style.java:445
-#: build/trans_style.java:458 build/trans_style.java:459
+#: build/trans_style.java:373 build/trans_style.java:386
+#: build/trans_style.java:387 build/trans_style.java:400
+#: build/trans_style.java:401 build/trans_style.java:420
+#: build/trans_style.java:421 build/trans_style.java:428
+#: build/trans_style.java:441 build/trans_style.java:442
+#: build/trans_style.java:455 build/trans_style.java:456
+#: build/trans_style.java:469 build/trans_style.java:470
 msgid "barrier"
 msgstr ""
@@ -19076,6 +19134,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:588 build/trans_style.java:604
-#: build/trans_style.java:620 build/trans_style.java:628
+#: build/trans_style.java:599 build/trans_style.java:615
+#: build/trans_style.java:631 build/trans_style.java:639
 msgid "street"
 msgstr "tänav"
@@ -19131,7 +19189,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:612 build/trans_style.java:910
-#: build/trans_style.java:918 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:623 build/trans_style.java:921
+#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:945 build/trans_style.java:953
 msgid "highway_track"
 msgstr "teerada"
@@ -19187,8 +19245,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:693 build/trans_style.java:1142
-#: build/trans_style.java:1206 build/trans_style.java:1214
-#: build/trans_style.java:1223 build/trans_style.java:1231
-#: build/trans_style.java:1232
+#: build/trans_style.java:704 build/trans_style.java:1153
+#: build/trans_style.java:1217 build/trans_style.java:1225
+#: build/trans_style.java:1234 build/trans_style.java:1242
+#: build/trans_style.java:1243
 msgid "rail"
 msgstr "raudtee"
@@ -19209,5 +19267,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:808
+#: build/trans_style.java:819
 msgid "services"
 msgstr ""
@@ -19221,5 +19279,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:816
+#: build/trans_style.java:827
 msgid "ford"
 msgstr ""
@@ -19240,5 +19298,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:831
+#: build/trans_style.java:842
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -19253,5 +19311,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:848
+#: build/trans_style.java:859
 msgid "emergency_access_point"
 msgstr ""
@@ -19266,5 +19324,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:960 build/trans_style.java:961
+#: build/trans_style.java:971 build/trans_style.java:972
 msgid "riverbank"
 msgstr "jõekallas"
@@ -19278,5 +19336,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:977
+#: build/trans_style.java:988
 msgid "stream"
 msgstr "oja"
@@ -19290,5 +19348,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1004
 msgid "dock"
 msgstr "dokk"
@@ -19316,5 +19374,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1015
+#: build/trans_style.java:1026
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -19482,13 +19540,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1024 build/trans_style.java:1053
-#: build/trans_style.java:1061 build/trans_style.java:1062
-#: build/trans_style.java:1070 build/trans_style.java:1510
-#: build/trans_style.java:1517 build/trans_style.java:1526
-#: build/trans_style.java:1534 build/trans_style.java:1559
-#: build/trans_style.java:1567 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1590
-#: build/trans_style.java:1599 build/trans_style.java:1607
-#: build/trans_style.java:1615 build/trans_style.java:1623
+#: build/trans_style.java:1035 build/trans_style.java:1064
+#: build/trans_style.java:1072 build/trans_style.java:1073
+#: build/trans_style.java:1081 build/trans_style.java:1521
+#: build/trans_style.java:1528 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1586
+#: build/trans_style.java:1594 build/trans_style.java:1601
+#: build/trans_style.java:1610 build/trans_style.java:1618
+#: build/trans_style.java:1626 build/trans_style.java:1634
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -19550,7 +19608,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1080 build/trans_style.java:1095
-#: build/trans_style.java:1110 build/trans_style.java:1126
-#: build/trans_style.java:1134
+#: build/trans_style.java:1091 build/trans_style.java:1106
+#: build/trans_style.java:1121 build/trans_style.java:1137
+#: build/trans_style.java:1145
 msgid "railwaypoint"
 msgstr ""
@@ -19573,10 +19631,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1151 build/trans_style.java:1160
+#: build/trans_style.java:1162 build/trans_style.java:1171
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1152
+#: build/trans_style.java:1163
 msgid "railover"
 msgstr "ülarelss"
@@ -19612,7 +19670,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1176 build/trans_style.java:1186
 #: build/trans_style.java:1187 build/trans_style.java:1197
-#: build/trans_style.java:1198
+#: build/trans_style.java:1198 build/trans_style.java:1208
+#: build/trans_style.java:1209
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -19657,6 +19715,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1262 build/trans_style.java:1263
-#: build/trans_style.java:1295
+#: build/trans_style.java:1273 build/trans_style.java:1274
+#: build/trans_style.java:1306
 msgid "aeroway"
 msgstr "aeronautika"
@@ -19670,5 +19728,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1271
+#: build/trans_style.java:1282
 msgid "terminal"
 msgstr "lennuterminal"
@@ -19690,5 +19748,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1279 build/trans_style.java:1287
+#: build/trans_style.java:1290 build/trans_style.java:1298
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -19702,5 +19760,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1303
+#: build/trans_style.java:1314
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -19748,7 +19806,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1313 build/trans_style.java:1321
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345
+#: build/trans_style.java:1324 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1348
+#: build/trans_style.java:1356
 msgid "aerialway"
 msgstr "trosstransport"
@@ -19765,5 +19823,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1355 build/trans_style.java:1356
+#: build/trans_style.java:1366 build/trans_style.java:1367
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -19778,5 +19836,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1364 build/trans_style.java:1365
+#: build/trans_style.java:1375 build/trans_style.java:1376
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -19791,5 +19849,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1373 build/trans_style.java:1374
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -19804,5 +19862,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1382 build/trans_style.java:1383
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_expert"
 msgstr ""
@@ -19817,5 +19875,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1391 build/trans_style.java:1392
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -19830,5 +19888,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1400 build/trans_style.java:1401
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -19933,10 +19991,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1412 build/trans_style.java:1419
-#: build/trans_style.java:1428 build/trans_style.java:1436
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
+#: build/trans_style.java:1423 build/trans_style.java:1430
+#: build/trans_style.java:1439 build/trans_style.java:1447
+#: build/trans_style.java:1455 build/trans_style.java:1463
+#: build/trans_style.java:1471 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1495
+#: build/trans_style.java:1503 build/trans_style.java:1511
 msgid "power"
 msgstr "elektrivarustus"
@@ -19950,5 +20008,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1541 build/trans_style.java:1542
+#: build/trans_style.java:1552 build/trans_style.java:1553
 msgid "pier"
 msgstr "kai"
@@ -19962,5 +20020,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1550
+#: build/trans_style.java:1561
 msgid "pipeline"
 msgstr "torujuhe"
@@ -20088,12 +20146,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1633 build/trans_style.java:1641
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1689 build/trans_style.java:1697
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753
+#: build/trans_style.java:1644 build/trans_style.java:1652
+#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1676 build/trans_style.java:1684
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1732 build/trans_style.java:1740
+#: build/trans_style.java:1748 build/trans_style.java:1756
+#: build/trans_style.java:1764
 msgid "leisure"
 msgstr "puhkealad"
@@ -20107,5 +20165,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1681
+#: build/trans_style.java:1692
 msgid "marina"
 msgstr "paadisadam"
@@ -20177,8 +20235,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1763 build/trans_style.java:1771
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
+#: build/trans_style.java:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1822 build/trans_style.java:1830
 msgid "amenity"
 msgstr "mugavused"
@@ -20280,10 +20338,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1827 build/trans_style.java:1835
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1898
-#: build/trans_style.java:1907 build/trans_style.java:1915
+#: build/trans_style.java:1838 build/trans_style.java:1846
+#: build/trans_style.java:1854 build/trans_style.java:1862
+#: build/trans_style.java:1870 build/trans_style.java:1878
+#: build/trans_style.java:1886 build/trans_style.java:1894
+#: build/trans_style.java:1902 build/trans_style.java:1909
+#: build/trans_style.java:1918 build/trans_style.java:1926
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -20669,22 +20727,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1923 build/trans_style.java:1931
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:2094 build/trans_style.java:2102
-#: build/trans_style.java:2109 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2229 build/trans_style.java:2237
-#: build/trans_style.java:2245 build/trans_style.java:2254
-#: build/trans_style.java:2262 build/trans_style.java:2269
-#: build/trans_style.java:2277 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2358 build/trans_style.java:2366
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1990
+#: build/trans_style.java:2105 build/trans_style.java:2113
+#: build/trans_style.java:2120 build/trans_style.java:2129
+#: build/trans_style.java:2137 build/trans_style.java:2145
+#: build/trans_style.java:2153 build/trans_style.java:2161
+#: build/trans_style.java:2169 build/trans_style.java:2177
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2256 build/trans_style.java:2265
+#: build/trans_style.java:2273 build/trans_style.java:2280
+#: build/trans_style.java:2288 build/trans_style.java:2296
+#: build/trans_style.java:2304 build/trans_style.java:2312
+#: build/trans_style.java:2320 build/trans_style.java:2328
+#: build/trans_style.java:2336 build/trans_style.java:2344
+#: build/trans_style.java:2352 build/trans_style.java:2360
+#: build/trans_style.java:2369 build/trans_style.java:2377
 msgid "amenity_light"
 msgstr "muud mugavused"
@@ -20716,6 +20774,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:3246
+#: build/trans_style.java:1998 build/trans_style.java:2006
+#: build/trans_style.java:3257
 msgid "light_water"
 msgstr "vesi"
@@ -20776,8 +20834,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2198
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:2221
+#: build/trans_style.java:2184 build/trans_style.java:2192
+#: build/trans_style.java:2200 build/trans_style.java:2209
+#: build/trans_style.java:2216 build/trans_style.java:2224
+#: build/trans_style.java:2232
 msgid "health"
 msgstr "tervishoid"
@@ -21130,26 +21188,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2385 build/trans_style.java:2393
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2722
+#: build/trans_style.java:2396 build/trans_style.java:2404
+#: build/trans_style.java:2412 build/trans_style.java:2420
+#: build/trans_style.java:2428 build/trans_style.java:2436
+#: build/trans_style.java:2444 build/trans_style.java:2452
+#: build/trans_style.java:2460 build/trans_style.java:2468
+#: build/trans_style.java:2476 build/trans_style.java:2484
+#: build/trans_style.java:2492 build/trans_style.java:2500
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2532
+#: build/trans_style.java:2540 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2660
+#: build/trans_style.java:2668 build/trans_style.java:2676
+#: build/trans_style.java:2684 build/trans_style.java:2692
+#: build/trans_style.java:2700 build/trans_style.java:2708
+#: build/trans_style.java:2716 build/trans_style.java:2724
+#: build/trans_style.java:2733
 msgid "shop"
 msgstr "pood"
@@ -21221,8 +21279,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2732 build/trans_style.java:2740
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
+#: build/trans_style.java:2743 build/trans_style.java:2751
+#: build/trans_style.java:2759 build/trans_style.java:2767
+#: build/trans_style.java:2775 build/trans_style.java:2783
+#: build/trans_style.java:2791 build/trans_style.java:2799
 msgid "hotel"
 msgstr "hotell"
@@ -21372,9 +21430,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2796 build/trans_style.java:2804
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2837 build/trans_style.java:2845
-#: build/trans_style.java:2861 build/trans_style.java:2932
+#: build/trans_style.java:2807 build/trans_style.java:2815
+#: build/trans_style.java:2823 build/trans_style.java:2831
+#: build/trans_style.java:2839 build/trans_style.java:2847
+#: build/trans_style.java:2848 build/trans_style.java:2856
+#: build/trans_style.java:2872 build/trans_style.java:2943
 msgid "tourism"
 msgstr "turism"
@@ -21446,8 +21504,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2942 build/trans_style.java:2950
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:2953 build/trans_style.java:2961
+#: build/trans_style.java:2969 build/trans_style.java:2977
+#: build/trans_style.java:2985 build/trans_style.java:2993
+#: build/trans_style.java:3001 build/trans_style.java:3009
 msgid "historic"
 msgstr "alalooline"
@@ -21518,8 +21576,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3007 build/trans_style.java:3015
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3079 build/trans_style.java:3087
-#: build/trans_style.java:3185 build/trans_style.java:3193
+#: build/trans_style.java:3018 build/trans_style.java:3026
+#: build/trans_style.java:3034 build/trans_style.java:3042
+#: build/trans_style.java:3090 build/trans_style.java:3098
+#: build/trans_style.java:3196 build/trans_style.java:3204
 msgid "green"
 msgstr "roheline"
@@ -21533,5 +21591,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3039
+#: build/trans_style.java:3050
 msgid "quarry"
 msgstr "kivimurd"
@@ -21545,5 +21603,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3047
+#: build/trans_style.java:3058
 msgid "landfill"
 msgstr "prügimägi"
@@ -21565,5 +21623,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3066 build/trans_style.java:3074
 msgid "basin"
 msgstr "tehisjärv"
@@ -21577,5 +21635,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3071
+#: build/trans_style.java:3082
 msgid "forest"
 msgstr "kultuurmets"
@@ -21589,5 +21647,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3114
 msgid "farmyard"
 msgstr "taluõu"
@@ -21610,5 +21668,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3112 build/trans_style.java:3120
+#: build/trans_style.java:3123 build/trans_style.java:3131
 msgid "retail"
 msgstr "kaubandus"
@@ -21622,5 +21680,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3128
+#: build/trans_style.java:3139
 msgid "industrial"
 msgstr "tööstus"
@@ -21634,5 +21692,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3136
+#: build/trans_style.java:3147
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -21646,5 +21704,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3155
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -21658,5 +21716,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3163
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -21713,7 +21771,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3169 build/trans_style.java:3204
-#: build/trans_style.java:3212 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
+#: build/trans_style.java:3180 build/trans_style.java:3215
+#: build/trans_style.java:3223 build/trans_style.java:3231
+#: build/trans_style.java:3239 build/trans_style.java:3247
 msgid "military"
 msgstr "militaarala"
@@ -21727,5 +21785,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3177
+#: build/trans_style.java:3188
 msgid "cemetery"
 msgstr "kalmistu"
@@ -21738,5 +21796,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3253
+#: build/trans_style.java:3264
 msgid "peak"
 msgstr "mäetipp"
@@ -21751,5 +21809,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3262
+#: build/trans_style.java:3273
 msgid "glacier"
 msgstr "liustik"
@@ -21763,5 +21821,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3270
+#: build/trans_style.java:3281
 msgid "volcano"
 msgstr "vulkaan"
@@ -21816,8 +21874,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3278 build/trans_style.java:3279
-#: build/trans_style.java:3287 build/trans_style.java:3303
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392
+#: build/trans_style.java:3289 build/trans_style.java:3290
+#: build/trans_style.java:3298 build/trans_style.java:3314
+#: build/trans_style.java:3387 build/trans_style.java:3395
+#: build/trans_style.java:3403
 msgid "natural"
 msgstr "looduslik"
@@ -21831,5 +21889,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3295
+#: build/trans_style.java:3306
 msgid "scrub"
 msgstr "põõsastik"
@@ -21843,5 +21901,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3322
 msgid "heath"
 msgstr "nõmm"
@@ -21855,5 +21913,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3319
+#: build/trans_style.java:3330
 msgid "wood"
 msgstr "mets"
@@ -21867,5 +21925,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3360
+#: build/trans_style.java:3371
 msgid "mud"
 msgstr "muda"
@@ -21879,5 +21937,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3368
+#: build/trans_style.java:3379
 msgid "beach"
 msgstr "rand"
@@ -21955,8 +22013,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
+#: build/trans_style.java:3419 build/trans_style.java:3427
+#: build/trans_style.java:3435 build/trans_style.java:3443
+#: build/trans_style.java:3451 build/trans_style.java:3459
+#: build/trans_style.java:3467 build/trans_style.java:3475
 msgid "route"
 msgstr "teekond"
@@ -22004,7 +22062,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3474 build/trans_style.java:3482
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506
+#: build/trans_style.java:3485 build/trans_style.java:3493
+#: build/trans_style.java:3501 build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "boundary"
 msgstr "piir"
@@ -22146,10 +22204,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:3941 build/trans_style.java:3949
+#: build/trans_style.java:3957 build/trans_style.java:3965
+#: build/trans_style.java:3973 build/trans_style.java:3981
+#: build/trans_style.java:3989 build/trans_style.java:3997
+#: build/trans_style.java:4005 build/trans_style.java:4013
+#: build/trans_style.java:4021 build/trans_style.java:4029
 msgid "place"
 msgstr "koht"
@@ -22197,6 +22255,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4135 build/trans_style.java:4142
-#: build/trans_style.java:4149 build/trans_style.java:4156
+#: build/trans_style.java:4146 build/trans_style.java:4153
+#: build/trans_style.java:4160 build/trans_style.java:4167
 msgid "address"
 msgstr "aadress"
@@ -22319,9 +22377,14 @@
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
+msgid "abbreviated street name"
+msgstr "lühendatud tänava nimi"
+
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#: build/trans_validator.java:40
 msgid "oneway tag on a node"
 msgstr "ühesuunaline silt sõlmel (oneway)"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:39
+#: build/trans_validator.java:41
 msgid "bridge tag on a node"
 msgstr "silla silt sõlmel"
@@ -22332,35 +22395,43 @@
 #. node : W : highway == residential
 #. node : W : highway == unclassified
-#: build/trans_validator.java:40 build/trans_validator.java:41
 #: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44
+#: build/trans_validator.java:44 build/trans_validator.java:45
+#: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
 msgstr "vale maantee silt sõlmel"
 
 #. node : W : highway == track
+#: build/trans_validator.java:47
+msgid "Unnamed unclassified highway"
+msgstr ""
+
+#. way  : W : highway == unclassified && name != *
 #. way  : I : highway == secondary && ref != *
 #. way  : I : highway == tertiary && ref != *
-#: build/trans_validator.java:45 build/trans_validator.java:46
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48 build/trans_validator.java:49
+#: build/trans_validator.java:50
 msgid "highway without a reference"
 msgstr "maantee ilma viiteta"
 
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48
+#: build/trans_validator.java:51
 msgid "temporary highway type"
 msgstr "ajutise maantee tüüp"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:49
+#: build/trans_validator.java:52
 msgid "misspelled key name"
 msgstr "valesti kirjutatud maantee silt"
 
 #. *    : W : / *name */i == * && name != *
-#: build/trans_validator.java:51
+#. The following could replace unnamed way check. Still at the moment we keep it as it is
+#. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
+#. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
 msgstr "jalgrattatee jalgratta sildiga (cycleway vs cycle)"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:52
+#: build/trans_validator.java:59
 msgid "footway with tag foot"
 msgstr "kõnnitee jala sildiga (footway vs foot)"
@@ -22369,10 +22440,10 @@
 #. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
-#: build/trans_validator.java:55
+#: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
 msgstr "cycleway ei saa olla rida cyclewayl"
 
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:56
+#: build/trans_validator.java:63
 msgid "barrier used on a way"
 msgstr "tõke teel"
@@ -22381,30 +22452,25 @@
 #. way  : I : waterway == * && layer != *                         # waterway without layer tag
 #. way  : I : highway == footway && maxspeed == *
-#: build/trans_validator.java:59 build/trans_validator.java:60
+#: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
 msgstr "kõnniteele on määratud maksimaalne kiirus"
 
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:62
+#: build/trans_validator.java:69
 msgid "layer tag with + sign"
 msgstr "kihi silt + märgiga"
 
 #. *    : W : layer == /\+.*/
-#: build/trans_validator.java:64
+#: build/trans_validator.java:71
 msgid "street name contains ss"
 msgstr "tänava nimi sisaldab ss"
 
 #. *    : I : name == /.*Strasse.*/i
-#: build/trans_validator.java:65
-msgid "abbreviated street name"
-msgstr "lühendatud tänava nimi"
-
-#. *    : W : name == /.*Str\.?/i
-#: build/trans_validator.java:67
+#: build/trans_validator.java:73
 msgid "relation without type"
 msgstr "seos ilma tüübita"
 
 #. relation : E : type != *
-#: build/trans_validator.java:69
+#: build/trans_validator.java:75
 msgid "restaurant without name"
 msgstr "restoran ilma nimeta"
@@ -22414,6 +22480,6 @@
 #. *    : W : natural == water && waterway == *
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:71 build/trans_validator.java:72
-#: build/trans_validator.java:73
+#: build/trans_validator.java:77 build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "unusual tag combination"
 msgstr "ebatavaline sildikombinatsioon"
@@ -22453,7 +22519,6 @@
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-#, fuzzy
 msgid "OpenStreetMap"
-msgstr "Openstreetmapi andmed"
+msgstr ""
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
@@ -22489,51 +22554,36 @@
 #~ msgstr "Andmekiht"
 
+#~ msgid "Uploading data"
+#~ msgstr "Andmete üles laadimine"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pole veel teostatud."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Lahenda konfliktid"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Importimisel tekkisid konfliktid."
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "my version:"
+#~ msgstr "minu versioon:"
+
+#~ msgid "their version:"
+#~ msgstr "nende versioon:"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kasutajanimi (email)"
+
+#~ msgid "Unknown host"
+#~ msgstr "Tundmatu host"
+
 #~ msgid "Change"
 #~ msgstr "Muuda"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konfliktid: {0}"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME parandatud)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Uploading data"
-#~ msgstr "Andmete üles laadimine"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pole veel teostatud."
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Lahenda konfliktid"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
-#~ msgid "Unknown host"
-#~ msgstr "Tundmatu host"
 
 #~ msgid "Click Reload to refresh list"
@@ -22553,4 +22603,13 @@
 #~ "versiooniks."
 
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Viga serveri vastuse töötlemisel."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Ei saa serveriga ühenduda."
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -22567,4 +22626,22 @@
 #~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
 
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME parandatud)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -22574,4 +22651,7 @@
 #~ "laadida."
 
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konfliktid: {0}"
+
 #~ msgid "The projection could not be read from preferences. Using EPSG:4326"
 #~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
