Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 14020)
+++ applications/editors/josm/i18n/po/ru.po	(revision 14033)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-08 15:15+0100\n"
-"PO-Revision-Date: 2009-03-04 22:07+0000\n"
+"POT-Creation-Date: 2009-03-08 22:55+0100\n"
+"PO-Revision-Date: 2009-03-08 15:18+0000\n"
 "Last-Translator: JekaDer <yourname@mail.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-08 12:52+0000\n"
+"X-Launchpad-Export-Date: 2009-03-08 21:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
@@ -1544,7 +1544,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Data Layer {0}"
-msgstr "Слой данных"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
@@ -1566,7 +1566,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
-#, fuzzy
 msgid "Errors during Download"
-msgstr "Ошибка при разборе."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1686,5 +1685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
@@ -1695,5 +1694,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
@@ -1728,5 +1727,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1735,5 +1734,5 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2075,5 +2074,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
 msgid "node"
 msgid_plural "nodes"
@@ -2158,15 +2157,15 @@
 msgstr "Автоматически исправлять тэги"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:305
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:306
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:315
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:316
 #, java-format
 msgid "Cannot open preferences directory: {0}"
 msgstr "Не удается прочитать каталог с настройками: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:333
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:334
 #, java-format
 msgid "Preferences file had errors. Making backup of old one to {0}."
@@ -2250,5 +2249,5 @@
 #: ../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:467
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
 msgid "relation"
 msgid_plural "relations"
@@ -2270,5 +2269,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "railway"
 msgstr "железная дорога"
@@ -2420,5 +2419,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
 msgid "way"
 msgid_plural "ways"
@@ -3271,5 +3270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2946
 msgid "Relations"
 msgstr "Отношения"
@@ -3466,5 +3465,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2596
 msgid "Places"
 msgstr "Места"
@@ -3511,21 +3510,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:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1901 build/trans_presets.java:1907
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1929 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2009
-#: build/trans_presets.java:2015 build/trans_presets.java:2021
-#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
 msgid "type"
 msgstr "тип"
@@ -3583,5 +3582,5 @@
 #. <key key="information" value="guidepost" />
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1682
 msgid "Map"
 msgstr "Карта"
@@ -3885,11 +3884,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1012
-#, fuzzy
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
 msgstr ""
-"Нектоторые точки, время сохранения которых оказалось раньше времени начала "
-"трека, были проигнорированы."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1016
@@ -3920,21 +3916,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1901 build/trans_presets.java:1907
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1929 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2009
-#: build/trans_presets.java:2015 build/trans_presets.java:2021
-#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
 msgid "track"
 msgid_plural "tracks"
@@ -4031,11 +4027,8 @@
 #. Not close enough to track, or no audio marker found for some other reason
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-#, fuzzy
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing (after the first marker)."
 msgstr ""
-"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
-"маркер."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
@@ -4238,23 +4231,23 @@
 #. item "Streets/Tertiary" text "Reference"
 #. <optional>
-#. item "Streets/Unclassified" label "Edit a Unclassified Road"
+#. item "Streets/Unclassified" label "Edit Unclassified Road"
 #. <space />
 #. <key key="highway" value="unclassified" />
 #. <optional>
-#. item "Streets/Residential" label "Edit a Residential Street"
+#. item "Streets/Residential" label "Edit Residential Street"
 #. <space />
 #. <key key="highway" value="residential" />
-#. item "Streets/Living Street" label "Edit a Living Street"
+#. item "Streets/Living Street" label "Edit Living Street"
 #. <space />
 #. <key key="highway" value="living_street" />
-#. item "Streets/Road (Unknown Type)" label "Edit a Road of unknown type"
+#. item "Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
 #. <key key="highway" value="road" />
 #. <optional>
-#. item "Streets/Bridge" label "Edit a Bridge"
+#. item "Streets/Bridge" label "Edit Bridge"
 #. <space />
 #. <key key="bridge" value="yes" />
 #. <optional>
-#. item "Streets/Tunnel" label "Edit a Tunnel"
+#. item "Streets/Tunnel" label "Edit Tunnel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -4263,5 +4256,5 @@
 #. <key key="tunnel" value="yes" />
 #. <optional>
-#. item "Ways/Construction" label "Edit a highway under construction"
+#. item "Ways/Construction" label "Edit Highway Under Construction"
 #. <!--     FIXME: no entry in the Wiki
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
@@ -4271,48 +4264,48 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Ways/Bridleway" label "Edit a Bridleway"
+#. item "Ways/Bridleway" label "Edit Bridleway"
 #. <space />
 #. <key key="highway" value="bridleway" />
 #. <optional>
-#. item "Ways/Cycleway" label "Edit a Cycleway"
+#. item "Ways/Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="cycleway" />
 #. <optional>
-#. item "Ways/Footway" label "Edit a Footway"
+#. item "Ways/Footway" label "Edit Footway"
 #. <space />
 #. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Pedestrian" label "Edit a Pedestrian Street"
+#. item "Ways/Pedestrian" label "Edit Pedestrian Street"
 #. <space />
 #. <key key="highway" value="pedestrian" />
-#. item "Ways/Steps" label "Edit a flight of Steps"
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #. <space />
 #. <key key="highway" value="steps" />
 #. <optional>
-#. item "Ways/Track" label "Edit a Track"
+#. item "Ways/Track" label "Edit Track"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Track Grade 1" label "Edit a Track of grade 1"
+#. item "Ways/Track Grade 1" label "Edit Track of grade 1"
 #. <space />
 #. <key key="highway" value="track" />
 #. <key key="tracktype" value="grade1" />
 #. <optional>
-#. item "Ways/Track Grade 2" label "Edit a Track of grade 2"
+#. item "Ways/Track Grade 2" label "Edit Track of grade 2"
 #. <space />
 #. <key key="highway" value="track" />
 #. <key key="tracktype" value="grade2" />
 #. <optional>
-#. item "Ways/Track Grade 3" label "Edit a Track of grade 3"
+#. item "Ways/Track Grade 3" label "Edit Track of grade 3"
 #. <space />
 #. <key key="highway" value="track" />
 #. <key key="tracktype" value="grade3" />
 #. <optional>
-#. item "Ways/Track Grade 4" label "Edit a Track of grade 4"
+#. item "Ways/Track Grade 4" label "Edit Track of grade 4"
 #. <space />
 #. <key key="highway" value="track" />
 #. <key key="tracktype" value="grade4" />
 #. <optional>
-#. item "Ways/Track Grade 5" label "Edit a Track of grade 5"
+#. item "Ways/Track Grade 5" label "Edit Track of grade 5"
 #. <space />
 #. <key key="highway" value="track" />
@@ -4339,10 +4332,10 @@
 #. <key key="sac_scale" value="alpine_hiking" />
 #. <optional>
-#. item "Ways/Demanding alpine hiking" label "Edit Demanding alpine hiking"
+#. item "Ways/Demanding Alpine Hiking" label "Edit Demanding Alpine Hiking"
 #. <space />
 #. <key key="highway" value="path" />
 #. <key key="sac_scale" value="demanding_alpine_hiking" />
 #. <optional>
-#. item "Ways/Difficult alpine hiking" label "Edit Difficult alpine hiking"
+#. item "Ways/Difficult Alpine Hiking" label "Edit Difficult Alpine Hiking"
 #. <space />
 #. <key key="highway" value="path" />
@@ -4356,5 +4349,5 @@
 #. <key key="highway" value="services" />
 #. <optional>
-#. item "Waypoints/City Limit" label "Edit a city limit sign"
+#. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
 #. <key key="traffic_sign" value="city_limit" />
@@ -4372,16 +4365,16 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Spring" label "Edit a Spring"
+#. item "Water/Spring" label "Edit Spring"
 #. <key key="natural" value="spring" />
-#. item "Water/Drain" label "Edit a Drain"
+#. item "Water/Drain" label "Edit Drain"
 #. <space />
 #. <key key="waterway" value="drain" />
-#. item "Water/Stream" label "Edit a Stream"
+#. item "Water/Stream" label "Edit Stream"
 #. <space />
 #. <key key="waterway" value="stream" />
-#. item "Water/Canal" label "Edit a Canal"
+#. item "Water/Canal" label "Edit Canal"
 #. <space />
 #. <key key="waterway" value="canal" />
-#. item "Water/River" label "Edit a River"
+#. item "Water/River" label "Edit River"
 #. <space />
 #. <key key="waterway" value="river" />
@@ -4398,5 +4391,5 @@
 #. item "Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
-#. item "Water/Riverbank" label "Edit a riverbank"
+#. item "Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
 #. item "Water/Wetland" label "Edit Wetland"
@@ -4412,21 +4405,21 @@
 #. item "Water/Coastline" label "Edit Coastline"
 #. <key key="natural" value="coastline" />
-#. item "Water/Ferry Route" label "Edit a Ferry"
+#. item "Water/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Boatyard" label "Edit a Boatyard"
+#. item "Water/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Dock" label "Edit a Dock"
+#. item "Water/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Dam" label "Edit a Dam"
+#. item "Water/Dam" label "Edit Dam"
 #. <space />
 #. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit a Weir"
+#. item "Waterway Point/Weir" label "Edit Weir"
 #. <space />
 #. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit a Waterfall"
+#. item "Waterway Point/Waterfall" label "Edit Waterfall"
 #. <space />
 #. <key key="waterway" value="waterfall" />
@@ -4439,15 +4432,15 @@
 #. item "Waterway Point/Slipway" label "Edit Slipway"
 #. <key key="leisure" value="slipway" />
-#. item "Railway/Bus Guideway" label "Edit a Bus Guideway"
+#. item "Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
 #. <key key="highway" value="bus_guideway" />
 #. <optional>
-#. item "Aerialway/Chair Lift" label "Edit a Chair Lift"
+#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
 #. <key key="aerialway" value="chair_lift" />
-#. item "Aerialway/Drag Lift" label "Edit a Drag Lift"
+#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
 #. <key key="aerialway" value="drag_lift" />
-#. item "Aerialway/Cable Car" label "Edit a Cable Car"
+#. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
-#. item "Aerialway/Station" label "Edit a Station"
+#. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
 #. item "Car/Fuel" label "Edit Fuel"
@@ -4487,5 +4480,5 @@
 #. <key key="railway" value="subway_entrance" />
 #. <optional>
-#. item "Public Transport/Bus Station" label "Edit a Bus Station"
+#. item "Public Transport/Bus Station" label "Edit Bus Station"
 #. <key key="amenity" value="bus_station" />
 #. <optional>
@@ -4494,7 +4487,7 @@
 #. <key key="highway" value="bus_stop" />
 #. <optional>
-#. item "Public Transport/Taxi" label "Edit a Taxi station"
+#. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit an airport"
+#. item "Public Transport/Airport" label "Edit Airport"
 #. <key key="aeroway" value="aerodrome" />
 #. item "Accomodation/Hotel" label "Edit Hotel"
@@ -4524,5 +4517,5 @@
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
 #. <key key="amenity" value="biergarten" />
-#. item "Food+Drinks/Bar" label "Edit a Bar"
+#. item "Food+Drinks/Bar" label "Edit Bar"
 #. <key key="amenity" value="bar" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
@@ -4565,7 +4558,7 @@
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
 #. <key key="historic" value="battlefield" />
-#. item "Historic Places/Wayside Cross" label "Edit a Wayside Cross"
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
-#. item "Historic Places/Wayside Shrine" label "Edit a Wayside Shrine"
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
 #. item "Leisure/Water Park" label "Edit Water Park"
@@ -4713,5 +4706,5 @@
 #. item "Man Made/Surveillance" label "Edit Surveillance Camera"
 #. <key key="man_made" value="surveillance" />
-#. item "Amenities/Fountain" label "Edit a Fountain"
+#. item "Amenities/Fountain" label "Edit Fountain"
 #. <key key="amenity" value="fountain" />
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
@@ -4779,5 +4772,5 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Places/Continent" label "Edit a Continent"
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
@@ -4838,5 +4831,5 @@
 #. <space />
 #. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit a Tree"
+#. item "Land use/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
 #. item "Land use/Wood" label "Edit Wood"
@@ -4923,5 +4916,5 @@
 #. item "Land use/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
-#. item "Relations/Multipolygon" label "Edit a Multipolygon"
+#. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
 #. <optional>
@@ -4945,130 +4938,130 @@
 #: build/trans_presets.java:712 build/trans_presets.java:725
 #: build/trans_presets.java:736 build/trans_presets.java:745
-#: build/trans_presets.java:792 build/trans_presets.java:807
-#: build/trans_presets.java:816 build/trans_presets.java:995
-#: build/trans_presets.java:1031 build/trans_presets.java:1039
-#: build/trans_presets.java:1047 build/trans_presets.java:1055
-#: build/trans_presets.java:1065 build/trans_presets.java:1073
-#: build/trans_presets.java:1078 build/trans_presets.java:1085
-#: build/trans_presets.java:1092 build/trans_presets.java:1097
-#: build/trans_presets.java:1105 build/trans_presets.java:1114
-#: build/trans_presets.java:1120 build/trans_presets.java:1126
-#: build/trans_presets.java:1131 build/trans_presets.java:1137
-#: build/trans_presets.java:1143 build/trans_presets.java:1152
-#: build/trans_presets.java:1161 build/trans_presets.java:1168
-#: build/trans_presets.java:1176 build/trans_presets.java:1189
-#: build/trans_presets.java:1195 build/trans_presets.java:1204
-#: build/trans_presets.java:1210 build/trans_presets.java:1216
-#: build/trans_presets.java:1224 build/trans_presets.java:1279
-#: build/trans_presets.java:1326 build/trans_presets.java:1332
-#: build/trans_presets.java:1338 build/trans_presets.java:1343
-#: build/trans_presets.java:1354 build/trans_presets.java:1362
-#: build/trans_presets.java:1371 build/trans_presets.java:1378
-#: build/trans_presets.java:1384 build/trans_presets.java:1392
-#: build/trans_presets.java:1399 build/trans_presets.java:1408
-#: build/trans_presets.java:1416 build/trans_presets.java:1423
-#: build/trans_presets.java:1434 build/trans_presets.java:1444
-#: build/trans_presets.java:1454 build/trans_presets.java:1474
-#: build/trans_presets.java:1486 build/trans_presets.java:1497
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1535 build/trans_presets.java:1542
-#: build/trans_presets.java:1547 build/trans_presets.java:1553
-#: build/trans_presets.java:1559 build/trans_presets.java:1564
-#: build/trans_presets.java:1570 build/trans_presets.java:1576
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
-#: build/trans_presets.java:1598 build/trans_presets.java:1604
-#: build/trans_presets.java:1609 build/trans_presets.java:1615
-#: build/trans_presets.java:1621 build/trans_presets.java:1628
-#: build/trans_presets.java:1636 build/trans_presets.java:1643
-#: build/trans_presets.java:1650 build/trans_presets.java:1656
-#: build/trans_presets.java:1662 build/trans_presets.java:1668
-#: build/trans_presets.java:1679 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1699
-#: build/trans_presets.java:1705 build/trans_presets.java:1715
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1732 build/trans_presets.java:1738
-#: build/trans_presets.java:1744 build/trans_presets.java:1749
-#: build/trans_presets.java:1754 build/trans_presets.java:1761
-#: build/trans_presets.java:1767 build/trans_presets.java:1772
-#: build/trans_presets.java:1780 build/trans_presets.java:1789
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1821
-#: build/trans_presets.java:1828 build/trans_presets.java:1834
-#: build/trans_presets.java:1840 build/trans_presets.java:1846
-#: build/trans_presets.java:1852 build/trans_presets.java:1858
-#: build/trans_presets.java:1864 build/trans_presets.java:1870
-#: build/trans_presets.java:1876 build/trans_presets.java:1882
-#: build/trans_presets.java:1888 build/trans_presets.java:1894
-#: build/trans_presets.java:1900 build/trans_presets.java:1906
-#: build/trans_presets.java:1912 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1936
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1954 build/trans_presets.java:1960
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2045 build/trans_presets.java:2051
-#: build/trans_presets.java:2057 build/trans_presets.java:2064
-#: build/trans_presets.java:2071 build/trans_presets.java:2079
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2124 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2144
-#: build/trans_presets.java:2152 build/trans_presets.java:2183
-#: build/trans_presets.java:2188 build/trans_presets.java:2193
-#: build/trans_presets.java:2198 build/trans_presets.java:2204
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2224 build/trans_presets.java:2230
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2248 build/trans_presets.java:2258
-#: build/trans_presets.java:2351 build/trans_presets.java:2358
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2405
-#: build/trans_presets.java:2411 build/trans_presets.java:2417
-#: build/trans_presets.java:2422 build/trans_presets.java:2427
-#: build/trans_presets.java:2432 build/trans_presets.java:2437
-#: build/trans_presets.java:2442 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2470
-#: build/trans_presets.java:2475 build/trans_presets.java:2480
-#: build/trans_presets.java:2485 build/trans_presets.java:2490
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2508 build/trans_presets.java:2513
-#: build/trans_presets.java:2518 build/trans_presets.java:2527
-#: build/trans_presets.java:2534 build/trans_presets.java:2548
-#: build/trans_presets.java:2553 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2584
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2637
-#: build/trans_presets.java:2643 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2663
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2723 build/trans_presets.java:2732
-#: build/trans_presets.java:2742 build/trans_presets.java:2751
-#: build/trans_presets.java:2757 build/trans_presets.java:2765
-#: build/trans_presets.java:2771 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:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2818 build/trans_presets.java:2825
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2847 build/trans_presets.java:2855
-#: build/trans_presets.java:2861 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2887 build/trans_presets.java:2893
-#: build/trans_presets.java:2899 build/trans_presets.java:2905
-#: build/trans_presets.java:2911 build/trans_presets.java:2917
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2946
-#: build/trans_presets.java:2960 build/trans_presets.java:2974
+#: build/trans_presets.java:792 build/trans_presets.java:813
+#: build/trans_presets.java:822 build/trans_presets.java:1001
+#: build/trans_presets.java:1037 build/trans_presets.java:1045
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1071 build/trans_presets.java:1079
+#: build/trans_presets.java:1084 build/trans_presets.java:1091
+#: build/trans_presets.java:1098 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1126 build/trans_presets.java:1132
+#: build/trans_presets.java:1137 build/trans_presets.java:1143
+#: build/trans_presets.java:1149 build/trans_presets.java:1158
+#: build/trans_presets.java:1167 build/trans_presets.java:1174
+#: build/trans_presets.java:1182 build/trans_presets.java:1195
+#: build/trans_presets.java:1201 build/trans_presets.java:1210
+#: build/trans_presets.java:1216 build/trans_presets.java:1222
+#: build/trans_presets.java:1230 build/trans_presets.java:1285
+#: build/trans_presets.java:1332 build/trans_presets.java:1338
+#: build/trans_presets.java:1344 build/trans_presets.java:1349
+#: build/trans_presets.java:1360 build/trans_presets.java:1368
+#: build/trans_presets.java:1377 build/trans_presets.java:1384
+#: build/trans_presets.java:1390 build/trans_presets.java:1398
+#: build/trans_presets.java:1405 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1429
+#: build/trans_presets.java:1440 build/trans_presets.java:1450
+#: build/trans_presets.java:1460 build/trans_presets.java:1480
+#: build/trans_presets.java:1492 build/trans_presets.java:1503
+#: build/trans_presets.java:1519 build/trans_presets.java:1526
+#: build/trans_presets.java:1541 build/trans_presets.java:1548
+#: build/trans_presets.java:1553 build/trans_presets.java:1559
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
+#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:1590 build/trans_presets.java:1597
+#: build/trans_presets.java:1604 build/trans_presets.java:1610
+#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1649
+#: build/trans_presets.java:1656 build/trans_presets.java:1662
+#: build/trans_presets.java:1668 build/trans_presets.java:1674
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1699 build/trans_presets.java:1705
+#: build/trans_presets.java:1711 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1733
+#: build/trans_presets.java:1738 build/trans_presets.java:1744
+#: build/trans_presets.java:1750 build/trans_presets.java:1755
+#: build/trans_presets.java:1760 build/trans_presets.java:1767
+#: build/trans_presets.java:1773 build/trans_presets.java:1778
+#: build/trans_presets.java:1786 build/trans_presets.java:1795
+#: build/trans_presets.java:1804 build/trans_presets.java:1813
+#: build/trans_presets.java:1822 build/trans_presets.java:1827
+#: build/trans_presets.java:1834 build/trans_presets.java:1840
+#: build/trans_presets.java:1846 build/trans_presets.java:1852
+#: build/trans_presets.java:1858 build/trans_presets.java:1864
+#: build/trans_presets.java:1870 build/trans_presets.java:1876
+#: build/trans_presets.java:1882 build/trans_presets.java:1888
+#: build/trans_presets.java:1894 build/trans_presets.java:1900
+#: build/trans_presets.java:1906 build/trans_presets.java:1912
+#: build/trans_presets.java:1918 build/trans_presets.java:1925
+#: build/trans_presets.java:1934 build/trans_presets.java:1942
+#: build/trans_presets.java:1948 build/trans_presets.java:1954
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2070
+#: build/trans_presets.java:2077 build/trans_presets.java:2085
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2130 build/trans_presets.java:2137
+#: build/trans_presets.java:2143 build/trans_presets.java:2150
+#: build/trans_presets.java:2158 build/trans_presets.java:2189
+#: build/trans_presets.java:2194 build/trans_presets.java:2199
+#: build/trans_presets.java:2204 build/trans_presets.java:2210
+#: build/trans_presets.java:2216 build/trans_presets.java:2222
+#: build/trans_presets.java:2230 build/trans_presets.java:2236
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2254 build/trans_presets.java:2264
+#: build/trans_presets.java:2357 build/trans_presets.java:2364
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2428 build/trans_presets.java:2433
+#: build/trans_presets.java:2438 build/trans_presets.java:2443
+#: build/trans_presets.java:2448 build/trans_presets.java:2453
+#: build/trans_presets.java:2459 build/trans_presets.java:2465
+#: build/trans_presets.java:2471 build/trans_presets.java:2476
+#: build/trans_presets.java:2481 build/trans_presets.java:2486
+#: build/trans_presets.java:2491 build/trans_presets.java:2496
+#: build/trans_presets.java:2502 build/trans_presets.java:2508
+#: build/trans_presets.java:2514 build/trans_presets.java:2519
+#: build/trans_presets.java:2524 build/trans_presets.java:2533
+#: build/trans_presets.java:2540 build/trans_presets.java:2554
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2592
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2625 build/trans_presets.java:2631
+#: build/trans_presets.java:2638 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2698
+#: build/trans_presets.java:2707 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2740
+#: build/trans_presets.java:2750 build/trans_presets.java:2759
+#: build/trans_presets.java:2765 build/trans_presets.java:2773
+#: build/trans_presets.java:2779 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:2802 build/trans_presets.java:2808
+#: build/trans_presets.java:2815 build/trans_presets.java:2821
+#: build/trans_presets.java:2826 build/trans_presets.java:2833
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2855 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2925
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2954
+#: build/trans_presets.java:2968 build/trans_presets.java:2982
 msgid "Name"
 msgstr "Название"
@@ -5132,5 +5125,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1353
 msgid "Car"
 msgstr "Авто"
@@ -5153,12 +5146,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:830 build/trans_presets.java:839
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:872 build/trans_presets.java:888
-#: build/trans_presets.java:899 build/trans_presets.java:922
-#: build/trans_presets.java:934 build/trans_presets.java:946
-#: build/trans_presets.java:958 build/trans_presets.java:1006
-#: build/trans_presets.java:1019 build/trans_presets.java:1403
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:836 build/trans_presets.java:845
+#: build/trans_presets.java:854 build/trans_presets.java:867
+#: build/trans_presets.java:878 build/trans_presets.java:894
+#: build/trans_presets.java:905 build/trans_presets.java:928
+#: build/trans_presets.java:940 build/trans_presets.java:952
+#: build/trans_presets.java:964 build/trans_presets.java:1012
+#: build/trans_presets.java:1025 build/trans_presets.java:1409
+#: build/trans_presets.java:1482
 msgid "Bicycle"
 msgstr "Вело"
@@ -5192,11 +5185,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:829 build/trans_presets.java:838
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:871 build/trans_presets.java:887
-#: build/trans_presets.java:898 build/trans_presets.java:921
-#: build/trans_presets.java:933 build/trans_presets.java:945
-#: build/trans_presets.java:957 build/trans_presets.java:1005
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:835 build/trans_presets.java:844
+#: build/trans_presets.java:853 build/trans_presets.java:866
+#: build/trans_presets.java:877 build/trans_presets.java:893
+#: build/trans_presets.java:904 build/trans_presets.java:927
+#: build/trans_presets.java:939 build/trans_presets.java:951
+#: build/trans_presets.java:963 build/trans_presets.java:1011
+#: build/trans_presets.java:1024
 msgid "Foot"
 msgstr "Пешком"
@@ -5787,33 +5780,33 @@
 msgstr "Группы модификаторов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383
 msgid "More information about this feature"
 msgstr "Ещё информации о этой возможности"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Использовать шаблон ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
 msgid "closedway"
 msgstr "замкнутая"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -5821,15 +5814,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
 #, java-format
@@ -5840,18 +5833,18 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
 msgid "Nothing selected!"
 msgstr "Ничего не выбрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
 msgid "Apply Preset"
 msgstr "Применить шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:676
 msgid "Change Properties"
 msgstr "Изменить параметры"
@@ -6198,6 +6191,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1310
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:769 build/trans_presets.java:1316
+#: build/trans_presets.java:1371
 msgid "unknown"
 msgstr "неизвестный"
@@ -6405,5 +6398,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2985
 msgid "Description"
 msgstr "Описание"
@@ -8338,7 +8331,6 @@
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
-#, fuzzy
 msgid "Reverse a terrace"
-msgstr "Изменить направление линии"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
@@ -8347,12 +8339,10 @@
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
-#, fuzzy
 msgid "Reverse a Terrace"
-msgstr "Изменить направление линии"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
-#, fuzzy
 msgid "Reverse Terrace"
-msgstr "Изменить направление линии"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
@@ -8366,9 +8356,6 @@
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
-#, fuzzy
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
-"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
-"точек."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
@@ -8379,18 +8366,15 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:420
 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
-#, fuzzy
 msgid "All"
-msgstr "все"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:403
 #: ../plugins/terracer/src/terracer/TerracerAction.java:427
-#, fuzzy
 msgid "Even"
-msgstr "чётные"
+msgstr ""
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:404
-#, fuzzy
 msgid "Odd"
-msgstr "Добавить"
+msgstr ""
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:68
@@ -9502,23 +9486,23 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
 #: build/trans_presets.java:51
-msgid "Edit a Motorway"
+msgid "Edit Motorway"
 msgstr "Править автобан"
 
-#. item "Streets/Motorway" label "Edit a Motorway"
+#. item "Streets/Motorway" label "Edit Motorway"
 #. <space />
 #. <key key="highway" value="motorway" />
-#. item "Streets/Trunk" label "Edit a Trunk"
+#. item "Streets/Trunk" label "Edit Trunk"
 #. <space />
 #. <key key="highway" value="trunk" />
-#. item "Streets/Trunk Link" label "Edit a Trunk Link"
+#. item "Streets/Trunk Link" label "Edit Trunk Link"
 #. <space />
 #. <key key="highway" value="trunk_link" />
-#. item "Streets/Primary" label "Edit a Primary Road"
+#. item "Streets/Primary" label "Edit Primary Road"
 #. <space />
 #. <key key="highway" value="primary" />
-#. item "Streets/Secondary" label "Edit a Secondary Road"
+#. item "Streets/Secondary" label "Edit Secondary Road"
 #. <space />
 #. <key key="highway" value="secondary" />
-#. item "Streets/Tertiary" label "Edit a Tertiary Road"
+#. item "Streets/Tertiary" label "Edit Tertiary Road"
 #. <space />
 #. <key key="highway" value="tertiary" />
@@ -9529,10 +9513,10 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1522 build/trans_presets.java:2975
+#: build/trans_presets.java:1528 build/trans_presets.java:2983
 msgid "Reference"
 msgstr "Сноска"
 
 #. item "Streets/Motorway" text "Name"
-#. item "Streets/Motorway Link" label "Edit a Motorway Link"
+#. item "Streets/Motorway Link" label "Edit Motorway Link"
 #. <space />
 #. <key key="highway" value="motorway_link" />
@@ -9542,5 +9526,5 @@
 #. <optional>
 #. item "Streets/Primary" text "Name"
-#. item "Streets/Primary Link" label "Edit a Primary Link"
+#. item "Streets/Primary Link" label "Edit Primary Link"
 #. <space />
 #. <key key="highway" value="primary_link" />
@@ -9582,7 +9566,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1040
-#: build/trans_presets.java:1048 build/trans_presets.java:1056
-#: build/trans_presets.java:1066 build/trans_presets.java:1285
+#: build/trans_presets.java:645 build/trans_presets.java:1046
+#: build/trans_presets.java:1054 build/trans_presets.java:1062
+#: build/trans_presets.java:1072 build/trans_presets.java:1291
 msgid "Layer"
 msgstr "Слой"
@@ -9625,5 +9609,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1293
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -9643,5 +9627,5 @@
 #. <optional>
 #. item "Streets/Service" text "Name"
-#. item "Streets/Parking Aisle" label "Edit a Parking Aisle"
+#. item "Streets/Parking Aisle" label "Edit Parking Aisle"
 #. <space />
 #. <key key="highway" value="service" />
@@ -9671,5 +9655,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1280
+#: build/trans_presets.java:640 build/trans_presets.java:1286
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -9725,5 +9709,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1281 build/trans_surveyor.java:12
+#: build/trans_presets.java:1287 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -9773,5 +9757,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1288
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -9818,5 +9802,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1283
+#: build/trans_presets.java:643 build/trans_presets.java:1289
 msgid "Cutting"
 msgstr ""
@@ -9863,5 +9847,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1284
+#: build/trans_presets.java:644 build/trans_presets.java:1290
 msgid "Embankment"
 msgstr ""
@@ -9877,5 +9861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
 #: build/trans_presets.java:70
-msgid "Edit a Motorway Link"
+msgid "Edit Motorway Link"
 msgstr "Править съезд с автобана"
 
@@ -9890,5 +9874,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
 #: build/trans_presets.java:87
-msgid "Edit a Trunk"
+msgid "Edit Trunk"
 msgstr "Править автостраду"
 
@@ -9903,5 +9887,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
 #: build/trans_presets.java:106
-msgid "Edit a Trunk Link"
+msgid "Edit Trunk Link"
 msgstr "Править съезд с автострады"
 
@@ -9921,5 +9905,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
 #: build/trans_presets.java:125
-msgid "Edit a Primary Road"
+msgid "Edit Primary Road"
 msgstr "Править основную дорогу"
 
@@ -9932,5 +9916,5 @@
 #. item
 #: build/trans_presets.java:142
-msgid "Edit a Primary Link"
+msgid "Edit Primary Link"
 msgstr "Править съезд с основной"
 
@@ -9950,5 +9934,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #: build/trans_presets.java:160
-msgid "Edit a Secondary Road"
+msgid "Edit Secondary Road"
 msgstr "Править вторичную"
 
@@ -9964,5 +9948,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #: build/trans_presets.java:180
-msgid "Edit a Tertiary Road"
+msgid "Edit Tertiary Road"
 msgstr "Править третичную"
 
@@ -9982,5 +9966,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #: build/trans_presets.java:199
-msgid "Edit a Unclassified Road"
+msgid "Edit Unclassified Road"
 msgstr "Править неклассифицированную дорогу"
 
@@ -10001,6 +9985,6 @@
 #. item "Ways/Demanding Mountain Hiking" text "Name"
 #. item "Ways/Alpine Hiking" text "Name"
-#. item "Ways/Demanding alpine hiking" text "Name"
-#. item "Ways/Difficult alpine hiking" text "Name"
+#. item "Ways/Demanding Alpine Hiking" text "Name"
+#. item "Ways/Difficult Alpine Hiking" text "Name"
 #. item "Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -10019,6 +10003,6 @@
 #: build/trans_presets.java:674 build/trans_presets.java:687
 #: build/trans_presets.java:700 build/trans_presets.java:713
-#: build/trans_presets.java:726 build/trans_presets.java:1288
-#: build/trans_presets.java:1464 build/trans_presets.java:1505
+#: build/trans_presets.java:726 build/trans_presets.java:1294
+#: build/trans_presets.java:1470 build/trans_presets.java:1511
 msgid "Width (meters)"
 msgstr ""
@@ -10038,5 +10022,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #: build/trans_presets.java:217
-msgid "Edit a Residential Street"
+msgid "Edit Residential Street"
 msgstr "Править улицу местного значения"
 
@@ -10067,5 +10051,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1286
+#: build/trans_presets.java:646 build/trans_presets.java:1292
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -10097,5 +10081,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1286
+#: build/trans_presets.java:646 build/trans_presets.java:1292
 msgid "paved"
 msgstr "асфальтированная"
@@ -10106,5 +10090,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1286
+#: build/trans_presets.java:646 build/trans_presets.java:1292
 msgid "unpaved"
 msgstr "неасфальтированная"
@@ -10118,5 +10102,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1286
+#: build/trans_presets.java:646 build/trans_presets.java:1292
 msgid "cobblestone"
 msgstr "мостовая"
@@ -10132,5 +10116,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
 #: build/trans_presets.java:235
-msgid "Edit a Living Street"
+msgid "Edit Living Street"
 msgstr "Править жилую улицу"
 
@@ -10145,8 +10129,8 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #: build/trans_presets.java:253
-msgid "Edit a Serviceway"
+msgid "Edit Serviceway"
 msgstr "Править служебную дорогу"
 
-#. item "Streets/Service" label "Edit a Serviceway"
+#. item "Streets/Service" label "Edit Serviceway"
 #. <space />
 #. <key key="highway" value="service" />
@@ -10180,5 +10164,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
 #: build/trans_presets.java:274
-msgid "Edit a Parking Aisle"
+msgid "Edit Parking Aisle"
 msgstr ""
 
@@ -10193,5 +10177,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
 #: build/trans_presets.java:287
-msgid "Edit a Road of unknown type"
+msgid "Edit Road of unknown type"
 msgstr "Править дорогу неизвестного типа"
 
@@ -10287,6 +10271,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1365
-#: build/trans_presets.java:2301 build/trans_presets.java:2559
+#: build/trans_presets.java:637 build/trans_presets.java:1371
+#: build/trans_presets.java:2307 build/trans_presets.java:2565
 msgid "yes"
 msgstr "да"
@@ -10430,7 +10414,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1310
-#: build/trans_presets.java:1365 build/trans_presets.java:2301
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:769 build/trans_presets.java:1316
+#: build/trans_presets.java:1371 build/trans_presets.java:2307
+#: build/trans_presets.java:2565
 msgid "no"
 msgstr "нет"
@@ -10457,10 +10441,10 @@
 #. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:873 build/trans_presets.java:900
-#: build/trans_presets.java:910 build/trans_presets.java:923
-#: build/trans_presets.java:935 build/trans_presets.java:947
-#: build/trans_presets.java:959 build/trans_presets.java:1007
-#: build/trans_presets.java:1020
+#: build/trans_presets.java:855 build/trans_presets.java:868
+#: build/trans_presets.java:879 build/trans_presets.java:906
+#: build/trans_presets.java:916 build/trans_presets.java:929
+#: build/trans_presets.java:941 build/trans_presets.java:953
+#: build/trans_presets.java:965 build/trans_presets.java:1013
+#: build/trans_presets.java:1026
 msgid "Horse"
 msgstr "Лошадь"
@@ -10481,11 +10465,11 @@
 #: 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:850
-#: build/trans_presets.java:863 build/trans_presets.java:874
-#: build/trans_presets.java:889 build/trans_presets.java:901
-#: build/trans_presets.java:911 build/trans_presets.java:924
-#: build/trans_presets.java:936 build/trans_presets.java:948
-#: build/trans_presets.java:960 build/trans_presets.java:1008
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:618 build/trans_presets.java:856
+#: build/trans_presets.java:869 build/trans_presets.java:880
+#: build/trans_presets.java:895 build/trans_presets.java:907
+#: build/trans_presets.java:917 build/trans_presets.java:930
+#: build/trans_presets.java:942 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:1014
+#: build/trans_presets.java:1027
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -10507,10 +10491,10 @@
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:851 build/trans_presets.java:875
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:925
-#: build/trans_presets.java:937 build/trans_presets.java:949
-#: build/trans_presets.java:961 build/trans_presets.java:1009
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:857 build/trans_presets.java:881
+#: build/trans_presets.java:896 build/trans_presets.java:908
+#: build/trans_presets.java:918 build/trans_presets.java:931
+#: build/trans_presets.java:943 build/trans_presets.java:955
+#: build/trans_presets.java:967 build/trans_presets.java:1015
+#: build/trans_presets.java:1028
 msgid "Motorcar"
 msgstr "Автомобиль"
@@ -10565,8 +10549,8 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #: build/trans_presets.java:331
-msgid "Edit a Junction"
+msgid "Edit Junction"
 msgstr "Править перекрёсток"
 
-#. item "Streets/Roundabout" label "Edit a Junction"
+#. item "Streets/Roundabout" label "Edit Junction"
 #. <space />
 #. <key key="junction" value="roundabout" />
@@ -10575,5 +10559,5 @@
 #. <key key="highway" value="path" />
 #. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit a crossing"
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
 #. item "Water/Wetland" text "Name"
@@ -10585,8 +10569,8 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1115
-#: build/trans_presets.java:1364 build/trans_presets.java:2257
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:769 build/trans_presets.java:1121
+#: build/trans_presets.java:1370 build/trans_presets.java:2263
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760
 msgid "Type"
 msgstr "Тип"
@@ -10926,10 +10910,10 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #: build/trans_presets.java:352
-msgid "Edit a Bridge"
+msgid "Edit Bridge"
 msgstr "Править мост"
 
 #. item
 #: build/trans_presets.java:364
-msgid "Edit a Tunnel"
+msgid "Edit Tunnel"
 msgstr ""
 
@@ -10947,5 +10931,5 @@
 #. item
 #: build/trans_presets.java:380
-msgid "Edit a highway under construction"
+msgid "Edit Highway Under Construction"
 msgstr "Править дорогу, на которой ведётся строительство"
 
@@ -10979,5 +10963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #: build/trans_presets.java:404
-msgid "Edit a Bridleway"
+msgid "Edit Bridleway"
 msgstr ""
 
@@ -10993,5 +10977,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #: build/trans_presets.java:424
-msgid "Edit a Cycleway"
+msgid "Edit Cycleway"
 msgstr "Править велодорожку"
 
@@ -11006,5 +10990,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #: build/trans_presets.java:443
-msgid "Edit a Footway"
+msgid "Edit Footway"
 msgstr "Править тротуар"
 
@@ -11019,5 +11003,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #: build/trans_presets.java:462
-msgid "Edit a Pedestrian Street"
+msgid "Edit Pedestrian Street"
 msgstr "Править пешеходную улицу"
 
@@ -11033,5 +11017,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #: build/trans_presets.java:481
-msgid "Edit a flight of Steps"
+msgid "Edit Flight of Steps"
 msgstr "Править лестницу"
 
@@ -11047,5 +11031,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #: build/trans_presets.java:501
-msgid "Edit a Track"
+msgid "Edit Track"
 msgstr "Править грунтовку"
 
@@ -11084,5 +11068,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
 #: build/trans_presets.java:521
-msgid "Edit a Track of grade 1"
+msgid "Edit Track of grade 1"
 msgstr "Править грунтовку 1 класса"
 
@@ -11097,5 +11081,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
 #: build/trans_presets.java:542
-msgid "Edit a Track of grade 2"
+msgid "Edit Track of grade 2"
 msgstr "Править грунтовку 2 класса"
 
@@ -11110,5 +11094,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
 #: build/trans_presets.java:563
-msgid "Edit a Track of grade 3"
+msgid "Edit Track of grade 3"
 msgstr "Править грунтовку 3 класса"
 
@@ -11123,5 +11107,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
 #: build/trans_presets.java:584
-msgid "Edit a Track of grade 4"
+msgid "Edit Track of grade 4"
 msgstr "Править грунтовку 4 класса"
 
@@ -11136,5 +11120,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
 #: build/trans_presets.java:605
-msgid "Edit a Track of grade 5"
+msgid "Edit Track of grade 5"
 msgstr "Править грунтовку 5 класса"
 
@@ -11220,5 +11204,5 @@
 #. </optional>
 #: build/trans_presets.java:703
-msgid "Demanding alpine hiking"
+msgid "Demanding Alpine Hiking"
 msgstr "Продвинутый альпийский туризм"
 
@@ -11228,11 +11212,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
 #: build/trans_presets.java:707
-msgid "Edit Demanding alpine hiking"
+msgid "Edit Demanding Alpine Hiking"
 msgstr "Править продвинутый альпийский туризм"
 
-#. item "Ways/Demanding alpine hiking" text "Width (meters)"
+#. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
 #: build/trans_presets.java:716
-msgid "Difficult alpine hiking"
+msgid "Difficult Alpine Hiking"
 msgstr "Сложный альпийский туризм"
 
@@ -11242,8 +11226,8 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
 #: build/trans_presets.java:720
-msgid "Edit Difficult alpine hiking"
+msgid "Edit Difficult Alpine Hiking"
 msgstr "Править сложный альпийский туризм"
 
-#. item "Ways/Difficult alpine hiking" text "Width (meters)"
+#. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
 #: build/trans_presets.java:730
@@ -11286,9 +11270,9 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
-#. item "Man Made/Power Station" label "Edit power station"
+#. item "Man Made/Power Station" label "Edit Power Station"
 #. <key key="power" value="station" />
-#. item "Man Made/Power Sub Station" label "Edit power sub station"
+#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
 #. <key key="power" value="sub_station" />
-#. item "Man Made/Power Line" label "Edit power line"
+#. item "Man Made/Power Line" label "Edit Power Line"
 #. <key key="power" value="line" />
 #. item
@@ -11299,20 +11283,22 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
-#. item "Amenities/Telephone" label "Edit a Telephone"
+#. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit a Baby Hatch"
+#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
 #. <key key="amenity" value="baby_hatch" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:996
-#: build/trans_presets.java:1355 build/trans_presets.java:1372
-#: build/trans_presets.java:1379 build/trans_presets.java:1385
-#: build/trans_presets.java:1393 build/trans_presets.java:1400
-#: build/trans_presets.java:2265 build/trans_presets.java:2272
-#: build/trans_presets.java:2288 build/trans_presets.java:2299
-#: build/trans_presets.java:2307 build/trans_presets.java:2314
-#: build/trans_presets.java:2364 build/trans_presets.java:2391
-#: build/trans_presets.java:2540 build/trans_presets.java:2980
+#: build/trans_presets.java:746 build/trans_presets.java:1002
+#: build/trans_presets.java:1361 build/trans_presets.java:1378
+#: build/trans_presets.java:1385 build/trans_presets.java:1391
+#: build/trans_presets.java:1399 build/trans_presets.java:1406
+#: build/trans_presets.java:2271 build/trans_presets.java:2278
+#: build/trans_presets.java:2294 build/trans_presets.java:2305
+#: build/trans_presets.java:2313 build/trans_presets.java:2320
+#: build/trans_presets.java:2370 build/trans_presets.java:2397
+#: build/trans_presets.java:2546 build/trans_presets.java:2582
+#: build/trans_presets.java:2988
 msgid "Operator"
 msgstr "Оператор"
@@ -11337,20 +11323,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1316
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1316
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1316
 msgid "island"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1316
 msgid "unmarked"
 msgstr ""
@@ -11358,5 +11344,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1317
 msgid "Cross on horseback"
 msgstr ""
@@ -11365,5 +11351,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1318
 msgid "Cross by bicycle"
 msgstr ""
@@ -11373,5 +11359,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1319
 msgid "Crossing attendant"
 msgstr ""
@@ -11423,6 +11409,7 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #: build/trans_presets.java:767
-msgid "Edit a crossing"
-msgstr ""
+#, fuzzy
+msgid "Edit Crossing"
+msgstr "Править каноэ"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
@@ -11463,5 +11450,5 @@
 #. item
 #: build/trans_presets.java:788
-msgid "Edit a city limit sign"
+msgid "Edit City Limit Sign"
 msgstr "Править границу населённого пункта"
 
@@ -11484,11 +11471,24 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
+#: build/trans_presets.java:801
+#, fuzzy
+msgid "Incline"
+msgstr "береговая линия"
+
+#. item
+#. <key key="highway" value="incline" />
+#: build/trans_presets.java:804
+msgid "Incline Steep"
+msgstr ""
+
+#. item
+#. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:808
 msgid "Ford"
 msgstr "Брод"
 
 #. item
-#: build/trans_presets.java:803
+#: build/trans_presets.java:809
 msgid "Edit Ford"
 msgstr "Править брод"
@@ -11496,5 +11496,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:810
+#: build/trans_presets.java:816
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -11502,5 +11502,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:812
+#: build/trans_presets.java:818
 msgid "Edit Mountain Pass"
 msgstr "Править перевал"
@@ -11511,7 +11511,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:817 build/trans_presets.java:1565
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:823 build/trans_presets.java:1571
+#: build/trans_presets.java:2685 build/trans_presets.java:2692
+#: build/trans_presets.java:2699
 msgid "Elevation"
 msgstr "Возвышение"
@@ -11519,10 +11519,10 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:821
+#: build/trans_presets.java:827
 msgid "Barriers"
 msgstr "Преграды"
 
 #. group "Barriers"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:828
 msgid "Stile"
 msgstr ""
@@ -11530,24 +11530,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:824
-msgid "Edit a Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit a Stile"
+#: build/trans_presets.java:830
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" label "Edit Stile"
 #. <space />
 #. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit a Kissing Gate"
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
 #. <space />
 #. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit a Hampshire Gate"
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
 #. <space />
 #. <key key="barrier" value="hampshire_gate" />
-#. item "Barriers/Bollard" label "Edit a bollard"
+#. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit a Drawbridge"
+#. item "Barriers/Drawbridge" label "Edit Drawbridge"
 #. <space />
 #. <key key="barrier" value="drawbridge" />
-#. item "Barriers/Cattle Grid" label "Edit a Cattle Grid"
+#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
 #. <key key="barrier" value="cattle_grid" />
@@ -11555,57 +11555,57 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit a Portcullis"
+#. item "Barriers/Portcullis" label "Edit Portcullis"
 #. <space />
 #. <key key="barrier" value="portcullis" />
-#. item "Barriers/Gate" label "Edit a Gate"
+#. item "Barriers/Gate" label "Edit Gate"
 #. <space />
 #. <key key="barrier" value="gate" />
-#. item "Barriers/Lift Gate" label "Edit a Lift Gate"
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
 #. <space />
 #. <key key="barrier" value="lift_gate" />
-#. item "Barriers/Sally Port" label "Edit a Sally Port"
+#. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit a Bump Gate"
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
 #. <space />
 #. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit a Border Control"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
 #. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit a Entrance"
+#. item "Barriers/Entrance" label "Edit Entrance"
 #. <space />
 #. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:827 build/trans_presets.java:836
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:869 build/trans_presets.java:885
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:919 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:1003 build/trans_presets.java:1016
+#: build/trans_presets.java:833 build/trans_presets.java:842
+#: build/trans_presets.java:851 build/trans_presets.java:864
+#: build/trans_presets.java:875 build/trans_presets.java:891
+#: build/trans_presets.java:902 build/trans_presets.java:914
+#: build/trans_presets.java:925 build/trans_presets.java:937
+#: build/trans_presets.java:949 build/trans_presets.java:961
+#: build/trans_presets.java:1009 build/trans_presets.java:1022
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:832
+#: build/trans_presets.java:838
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:833
-msgid "Edit a Kissing Gate"
+#: build/trans_presets.java:839
+msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:847
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:842
-msgid "Edit a Hampshire Gate"
+#: build/trans_presets.java:848
+msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:859
 msgid "Bollard"
 msgstr "Столбик"
@@ -11613,20 +11613,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:855
-msgid "Edit a bollard"
+#: build/trans_presets.java:861
+msgid "Edit Bollard"
 msgstr "Править столбик"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:871
 msgid "Drawbridge"
 msgstr "Подъёмный мост"
 
 #. item
-#: build/trans_presets.java:866
-msgid "Edit a Drawbridge"
+#: build/trans_presets.java:872
+msgid "Edit Drawbridge"
 msgstr "Править подъёмный мост"
 
 #. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -11634,5 +11634,5 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:880
+#: build/trans_presets.java:886
 msgid "Cattle Grid"
 msgstr ""
@@ -11640,30 +11640,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:882
-msgid "Edit a Cattle Grid"
+#: build/trans_presets.java:888
+msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:898
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item
-#: build/trans_presets.java:893
+#: build/trans_presets.java:899
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:910
 msgid "Portcullis"
 msgstr "Опускающаяся решётка"
 
 #. item
-#: build/trans_presets.java:905
-msgid "Edit a Portcullis"
+#: build/trans_presets.java:911
+msgid "Edit Portcullis"
 msgstr "Править опускающуюся решётку"
 
 #. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:914
+#: build/trans_presets.java:920
 msgid "Gate"
 msgstr "Ворота"
@@ -11671,40 +11671,40 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:916
-msgid "Edit a Gate"
+#: build/trans_presets.java:922
+msgid "Edit Gate"
 msgstr "Править ворота"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:933
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item
-#: build/trans_presets.java:928
-msgid "Edit a Lift Gate"
+#: build/trans_presets.java:934
+msgid "Edit Lift Gate"
 msgstr "Править шлагбаум"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:939
+#: build/trans_presets.java:945
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item
-#: build/trans_presets.java:940
-msgid "Edit a Sally Port"
+#: build/trans_presets.java:946
+msgid "Edit Sally Port"
 msgstr "Править двойные ворота"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:951
+#: build/trans_presets.java:957
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:952
-msgid "Edit a Bump Gate"
+#: build/trans_presets.java:958
+msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:963
+#: build/trans_presets.java:969
 msgid "Cycle Barrier"
 msgstr ""
@@ -11713,5 +11713,5 @@
 #. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:967
+#: build/trans_presets.java:973
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -11720,5 +11720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:971
+#: build/trans_presets.java:977
 msgid "Fence"
 msgstr "Забор"
@@ -11727,5 +11727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:975
+#: build/trans_presets.java:981
 msgid "Block"
 msgstr "Бетонный блок"
@@ -11733,5 +11733,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:984
 msgid "Wall"
 msgstr "Стена"
@@ -11739,5 +11739,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:981
+#: build/trans_presets.java:987
 msgid "City Wall"
 msgstr "Городская стена"
@@ -11746,5 +11746,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:985
+#: build/trans_presets.java:991
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -11753,5 +11753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:989
+#: build/trans_presets.java:995
 msgid "Toll Booth"
 msgstr "Оплата проезда"
@@ -11759,5 +11759,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:991
+#: build/trans_presets.java:997
 msgid "Edit Toll Booth"
 msgstr "Править пункт оплаты проезда"
@@ -11765,22 +11765,22 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1005
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
 #. item
-#: build/trans_presets.java:1000
-msgid "Edit a Border Control"
+#: build/trans_presets.java:1006
+msgid "Edit Border Control"
 msgstr "Править пограничный контороль"
 
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1018
 msgid "Entrance"
 msgstr "Вход"
 
 #. item
-#: build/trans_presets.java:1013
-msgid "Edit a Entrance"
+#: build/trans_presets.java:1019
+msgid "Edit Entrance"
 msgstr "Править вход"
 
@@ -11789,10 +11789,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1026 build/trans_presets.java:1069
+#: build/trans_presets.java:1032 build/trans_presets.java:1075
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1033
 msgid "Spring"
 msgstr "Источник"
@@ -11800,11 +11800,11 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1029
-msgid "Edit a Spring"
+#: build/trans_presets.java:1035
+msgid "Edit Spring"
 msgstr "Править источник"
 
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1040
 msgid "Drain"
 msgstr "Водосток"
@@ -11812,10 +11812,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1036
-msgid "Edit a Drain"
+#: build/trans_presets.java:1042
+msgid "Edit Drain"
 msgstr "Править водосток"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1048
 msgid "Stream"
 msgstr "Ручей"
@@ -11823,10 +11823,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1044
-msgid "Edit a Stream"
+#: build/trans_presets.java:1050
+msgid "Edit Stream"
 msgstr "Править ручей"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1056
 msgid "Canal"
 msgstr "Канал"
@@ -11834,10 +11834,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1052
-msgid "Edit a Canal"
+#: build/trans_presets.java:1058
+msgid "Edit Canal"
 msgstr "Править канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1064
 msgid "River"
 msgstr "Река"
@@ -11847,21 +11847,21 @@
 #. 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:1062
-msgid "Edit a River"
+#: build/trans_presets.java:1068
+msgid "Edit River"
 msgstr "Править реку"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1071
+#: build/trans_presets.java:1077
 msgid "Edit Water"
 msgstr "Править воду"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1081
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1082
 msgid "Edit Land"
 msgstr "Править сушу"
@@ -11869,15 +11869,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1087
 msgid "Basin"
 msgstr "Бассейн"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1088
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1093
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -11885,15 +11885,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1095
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1100
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1101
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
@@ -11901,5 +11901,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1106
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -11908,10 +11908,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:1103
-msgid "Edit a riverbank"
+#: build/trans_presets.java:1109
+msgid "Edit Riverbank"
 msgstr "Править берег реки"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1113
 msgid "Wetland"
 msgstr "Заболоченная территория"
@@ -11922,14 +11922,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:1112
+#: build/trans_presets.java:1118
 msgid "Edit Wetland"
 msgstr "Редактировать заболоченная территория"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "bog"
 msgstr "трясина"
@@ -11943,35 +11943,35 @@
 #. <condition k="natural" v="marsh"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1115 build/trans_style.java:3068
+#: build/trans_presets.java:1121 build/trans_style.java:3068
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1121
 msgid "mangrove"
 msgstr "мангры"
 
-#: build/trans_presets.java:1117
+#: build/trans_presets.java:1123
 msgid "Mud"
 msgstr "Грязь"
 
 #. item
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1124
 msgid "Edit Mud"
 msgstr "Править грязь"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1128
 msgid "Beach"
 msgstr "Пляж"
@@ -11979,20 +11979,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1130
 msgid "Edit Beach"
 msgstr "Править пляж"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1134
 msgid "Bay"
 msgstr "Бухта"
 
 #. item
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1135
 msgid "Edit Bay"
 msgstr "Править бухту"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1139
 msgid "Cliff"
 msgstr "Скала"
@@ -12000,10 +12000,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1141
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1145
 msgid "Coastline"
 msgstr "Побережье"
@@ -12011,5 +12011,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1147
 msgid "Edit Coastline"
 msgstr "Править побережье"
@@ -12017,5 +12017,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1152
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -12023,6 +12023,6 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1148
-msgid "Edit a Ferry"
+#: build/trans_presets.java:1154
+msgid "Edit Ferry"
 msgstr "Править переправу"
 
@@ -12030,5 +12030,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1162
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -12036,10 +12036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1158
-msgid "Edit a Boatyard"
+#: build/trans_presets.java:1164
+msgid "Edit Boatyard"
 msgstr "Править лодочную мастерскую"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1163
+#: build/trans_presets.java:1169
 msgid "Dock"
 msgstr "Причал"
@@ -12047,11 +12047,11 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1165
-msgid "Edit a Dock"
+#: build/trans_presets.java:1171
+msgid "Edit Dock"
 msgstr "Править причал"
 
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1177
 msgid "Dam"
 msgstr "Дамба"
@@ -12059,15 +12059,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1173
-msgid "Edit a Dam"
+#: build/trans_presets.java:1179
+msgid "Edit Dam"
 msgstr "Править дамбу"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1185
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1186
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -12076,5 +12076,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1190
 msgid "Weir"
 msgstr "Водослив"
@@ -12082,20 +12082,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1186
-msgid "Edit a Weir"
+#: build/trans_presets.java:1192
+msgid "Edit Weir"
 msgstr "Править водослив"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1197
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1192
-msgid "Edit a Waterfall"
+#: build/trans_presets.java:1198
+msgid "Edit Waterfall"
 msgstr "Править водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1203
 msgid "Turning Point"
 msgstr "Разворот"
@@ -12104,15 +12104,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1207
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1208
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1212
 msgid "Pier"
 msgstr "Пирс"
@@ -12120,10 +12120,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1214
 msgid "Edit Pier"
 msgstr "Править пирс"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1218
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
@@ -12131,10 +12131,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1220
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1224
 msgid "Slipway"
 msgstr "Слип"
@@ -12144,5 +12144,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:1222
+#: build/trans_presets.java:1228
 msgid "Edit Slipway"
 msgstr "Править слип"
@@ -12150,10 +12150,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1234
 msgid "Railway"
 msgstr "Железная дорога"
 
 #. group "Railway"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1235
 msgid "Rail"
 msgstr "Железная дорога"
@@ -12161,36 +12161,36 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1231
-msgid "Edit a Rail"
+#: build/trans_presets.java:1237
+msgid "Edit Rail"
 msgstr "Править железную дорогу"
 
-#. item "Railway/Rail" label "Edit a Rail"
+#. item "Railway/Rail" label "Edit Rail"
 #. <space />
 #. <key key="railway" value="rail" />
-#. item "Railway/Narrow Gauge Rail" label "Edit a Narrow Gauge Rail"
+#. item "Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
-#. item "Railway/Monorail" label "Edit a Monorail"
+#. item "Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Railway/Preserved" label "Edit a Preserved Railway"
+#. item "Railway/Preserved" label "Edit Preserved Railway"
 #. <space />
 #. <key key="railway" value="preserved" />
-#. item "Railway/Light Rail" label "Edit a Light Rail"
+#. item "Railway/Light Rail" label "Edit Light Rail"
 #. <space />
 #. <key key="railway" value="light_rail" />
-#. item "Railway/Subway" label "Edit a Subway"
+#. item "Railway/Subway" label "Edit Subway"
 #. <space />
 #. <key key="railway" value="subway" />
-#. item "Railway/Tram" label "Edit a Tram"
+#. item "Railway/Tram" label "Edit Tram"
 #. <space />
 #. <key key="railway" value="tram" />
-#. item "Railway/Disused Rail" label "Edit a Disused Railway"
+#. item "Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1234 build/trans_presets.java:1240
-#: build/trans_presets.java:1247 build/trans_presets.java:1253
-#: build/trans_presets.java:1259 build/trans_presets.java:1265
-#: build/trans_presets.java:1271 build/trans_presets.java:1296
+#: build/trans_presets.java:1240 build/trans_presets.java:1246
+#: build/trans_presets.java:1253 build/trans_presets.java:1259
+#: build/trans_presets.java:1265 build/trans_presets.java:1271
+#: build/trans_presets.java:1277 build/trans_presets.java:1302
 msgid "Optional Types"
 msgstr "Необязательные типы"
@@ -12204,35 +12204,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1234 build/trans_presets.java:1240
-#: build/trans_presets.java:1247 build/trans_presets.java:1253
-#: build/trans_presets.java:1259 build/trans_presets.java:1265
-#: build/trans_presets.java:1271 build/trans_presets.java:1296
+#: build/trans_presets.java:1240 build/trans_presets.java:1246
+#: build/trans_presets.java:1253 build/trans_presets.java:1259
+#: build/trans_presets.java:1265 build/trans_presets.java:1271
+#: build/trans_presets.java:1277 build/trans_presets.java:1302
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1234 build/trans_presets.java:1240
-#: build/trans_presets.java:1247 build/trans_presets.java:1253
-#: build/trans_presets.java:1259 build/trans_presets.java:1265
-#: build/trans_presets.java:1271 build/trans_presets.java:1296
+#: build/trans_presets.java:1240 build/trans_presets.java:1246
+#: build/trans_presets.java:1253 build/trans_presets.java:1259
+#: build/trans_presets.java:1265 build/trans_presets.java:1271
+#: build/trans_presets.java:1277 build/trans_presets.java:1302
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1234 build/trans_presets.java:1240
-#: build/trans_presets.java:1247 build/trans_presets.java:1253
-#: build/trans_presets.java:1259 build/trans_presets.java:1265
-#: build/trans_presets.java:1271 build/trans_presets.java:1296
+#: build/trans_presets.java:1240 build/trans_presets.java:1246
+#: build/trans_presets.java:1253 build/trans_presets.java:1259
+#: build/trans_presets.java:1265 build/trans_presets.java:1271
+#: build/trans_presets.java:1277 build/trans_presets.java:1302
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1242
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item
-#: build/trans_presets.java:1237
-msgid "Edit a Narrow Gauge Rail"
+#: build/trans_presets.java:1243
+msgid "Edit Narrow Gauge Rail"
 msgstr "Править узкоколейку"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1248
 msgid "Monorail"
 msgstr "Монорельс"
@@ -12240,45 +12240,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1244
-msgid "Edit a Monorail"
+#: build/trans_presets.java:1250
+msgid "Edit Monorail"
 msgstr "Править монорельс"
 
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1255
 msgid "Preserved"
 msgstr "Историческая"
 
 #. item
-#: build/trans_presets.java:1250
-msgid "Edit a Preserved Railway"
+#: build/trans_presets.java:1256
+msgid "Edit Preserved Railway"
 msgstr "Править историческую дорогу"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1261
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item
-#: build/trans_presets.java:1256
-msgid "Edit a Light Rail"
+#: build/trans_presets.java:1262
+msgid "Edit Light Rail"
 msgstr "Править лёгкую железную дорогу"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1267
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item
-#: build/trans_presets.java:1262
-msgid "Edit a Subway"
+#: build/trans_presets.java:1268
+msgid "Edit Subway"
 msgstr "Править метрополитен"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1273
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1268
-msgid "Edit a Tram"
+#: build/trans_presets.java:1274
+msgid "Edit Tram"
 msgstr "Править трамвай"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1279
 msgid "Bus Guideway"
 msgstr "Направляемый автобус"
@@ -12286,6 +12286,6 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1275
-msgid "Edit a Bus Guideway"
+#: build/trans_presets.java:1281
+msgid "Edit Bus Guideway"
 msgstr "Править рельсовый автобус"
 
@@ -12293,14 +12293,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1298
 msgid "Disused Rail"
 msgstr "Неиспользуемая"
 
 #. item
-#: build/trans_presets.java:1293
-msgid "Edit a Disused Railway"
+#: build/trans_presets.java:1299
+msgid "Edit Disused Railway"
 msgstr "Править неиспользуемую дорогу"
 
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1304
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
@@ -12309,5 +12309,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1308
 msgid "Level Crossing"
 msgstr "Регулируемый переезд"
@@ -12316,5 +12316,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1312
 msgid "Crossing"
 msgstr "Переезд"
@@ -12324,5 +12324,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1316
 msgid "Crossing type"
 msgstr ""
@@ -12330,5 +12330,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1322
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -12337,10 +12337,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1327
 msgid "Aerialway"
 msgstr "Надземные пути"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1328
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
@@ -12348,10 +12348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1324
-msgid "Edit a Chair Lift"
+#: build/trans_presets.java:1330
+msgid "Edit Chair Lift"
 msgstr "Править кресельную дорогу"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1334
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
@@ -12359,10 +12359,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1330
-msgid "Edit a Drag Lift"
+#: build/trans_presets.java:1336
+msgid "Edit Drag Lift"
 msgstr "Править бугельный подъёмник"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1340
 msgid "Cable Car"
 msgstr "Канатная дорога"
@@ -12370,21 +12370,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1336
-msgid "Edit a Cable Car"
+#: build/trans_presets.java:1342
+msgid "Edit Cable Car"
 msgstr "Править канатную дорогу"
 
 #. item "Aerialway/Cable Car" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1340 build/trans_presets.java:1427
+#: build/trans_presets.java:1346 build/trans_presets.java:1433
 msgid "Station"
 msgstr "Станция"
 
 #. item
-#: build/trans_presets.java:1341
-msgid "Edit a Station"
+#. item
+#. <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:1347 build/trans_presets.java:1436
+msgid "Edit Station"
 msgstr "Править станцию"
 
 #. group "Car"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1354
 msgid "Fuel"
 msgstr "Заправка"
@@ -12394,5 +12397,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:1352
+#: build/trans_presets.java:1358
 msgid "Edit Fuel"
 msgstr "Править заправку"
@@ -12408,5 +12411,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1357 build/trans_presets.java:1404
+#: build/trans_presets.java:1363 build/trans_presets.java:1410
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12416,5 +12419,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:1360
+#: build/trans_presets.java:1366
 msgid "Edit Parking"
 msgstr "Править стоянку"
@@ -12422,40 +12425,40 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1363 build/trans_presets.java:1409
+#: build/trans_presets.java:1369 build/trans_presets.java:1415
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1370
 msgid "surface"
 msgstr "наземная"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1370
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1370
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1370
 msgid "park_and_ride"
 msgstr "перехватывающая"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1371
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1372
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1374
 msgid "Wash"
 msgstr "Мойка"
 
 #. item
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1375
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
@@ -12463,5 +12466,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1418
+#: build/trans_presets.java:1380 build/trans_presets.java:1424
 msgid "Shop"
 msgstr "Магазин"
@@ -12469,15 +12472,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1382
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1387
 msgid "Repair"
 msgstr "Мастерская"
 
 #. item
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1388
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
@@ -12485,5 +12488,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1393 build/trans_presets.java:1417
 msgid "Rental"
 msgstr "Прокат"
@@ -12492,10 +12495,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:1390
+#: build/trans_presets.java:1396
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1401
 msgid "Sharing"
 msgstr "Совместное использование"
@@ -12503,5 +12506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1403
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
@@ -12509,5 +12512,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
@@ -12516,5 +12519,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:1414
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
@@ -12523,22 +12526,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:1421
+#: build/trans_presets.java:1427
 msgid "Edit Bicycle Shop"
 msgstr "Править веломастерскую"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1426
+#: build/trans_presets.java:1432
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
-#. item
-#. <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:1430
-msgid "Edit Station"
-msgstr "Править станцию"
-
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1435
+#: build/trans_presets.java:1441
 msgid "UIC-Reference"
 msgstr ""
@@ -12546,5 +12542,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1444
 msgid "Railway Halt"
 msgstr "Полустанок"
@@ -12552,5 +12548,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1446
 msgid "Edit Halt"
 msgstr "Править полустанок"
@@ -12558,5 +12554,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1453
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -12565,5 +12561,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:1450
+#: build/trans_presets.java:1456
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
@@ -12571,5 +12567,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1463
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
@@ -12578,15 +12574,15 @@
 #. <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:1460
-msgid "Edit a railway platform"
+#: build/trans_presets.java:1466
+msgid "Edit Railway Platform"
 msgstr "Править ж/д платформу"
 
-#. item "Public Transport/Railway Platform" label "Edit a railway platform"
+#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
 #. <key key="railway" value="platform" />
 #. <space />
-#. item "Public Transport/Bus Platform" label "Edit a bus platform"
+#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1463 build/trans_presets.java:1504
+#: build/trans_presets.java:1469 build/trans_presets.java:1510
 msgid "Reference (track number)"
 msgstr ""
@@ -12594,10 +12590,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1465 build/trans_presets.java:1506
+#: build/trans_presets.java:1471 build/trans_presets.java:1512
 msgid "Area"
 msgstr "Область"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1473
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -12606,10 +12602,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:1470
+#: build/trans_presets.java:1476
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1481
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
@@ -12618,5 +12614,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1480
+#: build/trans_presets.java:1486
 msgid "Bus Station"
 msgstr "Автовокзал"
@@ -12625,11 +12621,11 @@
 #. <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:1483
-msgid "Edit a Bus Station"
+#: build/trans_presets.java:1489
+msgid "Edit Bus Station"
 msgstr "Править автовокзал"
 
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1495
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -12639,5 +12635,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:1493
+#: build/trans_presets.java:1499
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
@@ -12645,16 +12641,16 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1506
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item
-#: build/trans_presets.java:1501
-msgid "Edit a bus platform"
+#: build/trans_presets.java:1507
+msgid "Edit Bus Platform"
 msgstr "Править автобусную платформу"
 
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1515
 msgid "Taxi"
 msgstr "Такси"
@@ -12662,11 +12658,11 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
-msgid "Edit a Taxi station"
+#: build/trans_presets.java:1517
+msgid "Edit Taxi station"
 msgstr "Править стоянку такси"
 
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1522
 msgid "Airport"
 msgstr "Аэропорт"
@@ -12674,15 +12670,16 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1518
-msgid "Edit an airport"
+#: build/trans_presets.java:1524
+#, fuzzy
+msgid "Edit Airport"
 msgstr "Править аэропорт"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1529
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1530
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
@@ -12691,5 +12688,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1535
 msgid "Accomodation"
 msgstr "Проживание"
@@ -12701,5 +12698,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1530 build/trans_surveyor.java:43
+#: build/trans_presets.java:1536 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -12708,15 +12705,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:1533
+#: build/trans_presets.java:1539
 msgid "Edit Hotel"
 msgstr "Править гостиницу"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1542
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1544
 msgid "Motel"
 msgstr "Мотель"
@@ -12724,20 +12721,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1546
 msgid "Edit Motel"
 msgstr "Править иотель"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1550
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1551
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1555
 msgid "Chalet"
 msgstr ""
@@ -12745,10 +12742,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1557
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1561
 msgid "Hostel"
 msgstr "Студенческое общежитие"
@@ -12756,30 +12753,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1563
 msgid "Edit Hostel"
 msgstr "Править студенческое общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1567
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1568
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1573
 msgid "Caravan Site"
 msgstr "Площадка для домов на колёсах"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1574
 msgid "Edit Caravan Site"
 msgstr "Править площадку для домов на колёсах"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1578
 msgid "Camping Site"
 msgstr "Кэмпинг"
@@ -12787,10 +12784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1580
 msgid "Edit Camping Site"
 msgstr "Править кэмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1585
 msgid "Food+Drinks"
 msgstr "Питание"
@@ -12801,5 +12798,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1580 build/trans_surveyor.java:47
+#: build/trans_presets.java:1586 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -12807,5 +12804,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1588
 msgid "Edit Restaurant"
 msgstr "Править ресторан"
@@ -12813,5 +12810,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "Cuisine"
 msgstr "Кухня"
@@ -12819,61 +12816,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "burger"
 msgstr "бургеры"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1585 build/trans_presets.java:1592
+#: build/trans_presets.java:1591 build/trans_presets.java:1598
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1593
 msgid "Fast Food"
 msgstr "Фастфуд"
@@ -12881,9 +12878,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1595
 msgid "Edit Fast Food Restaurant"
 msgstr "Правка фастфуда"
 
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1600
 msgid "Cafe"
 msgstr "Кафе"
@@ -12891,10 +12888,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1602
 msgid "Edit Cafe"
 msgstr "Править кафе"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1606
 msgid "Pub"
 msgstr "Бар"
@@ -12902,33 +12899,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1608
 msgid "Edit Pub"
 msgstr "Править бар"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1612
 msgid "Biergarten"
 msgstr "Пивная"
 
 #. item
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1613
 msgid "Edit Biergarten"
 msgstr "Править пивную"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1611
-#, fuzzy
+#: build/trans_presets.java:1617
 msgid "Bar"
-msgstr "Булочная"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1613
-#, fuzzy
-msgid "Edit a Bar"
-msgstr "Править лодочную мастерскую"
+#: build/trans_presets.java:1619
+msgid "Edit Bar"
+msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1623
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -12936,20 +12931,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1625
 msgid "Edit Nightclub"
 msgstr "Править ночной клуб"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1630
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1631
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1632
 msgid "Edit Attraction"
 msgstr "Править достопримечательность"
@@ -12958,24 +12953,22 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1629 build/trans_presets.java:1637
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:2371
 msgid "Opening Hours"
 msgstr "Часы работы"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1631
-#, fuzzy
+#: build/trans_presets.java:1637
 msgid "Information Office"
-msgstr "Информация"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1633
-#, fuzzy
+#: build/trans_presets.java:1639
 msgid "Edit Information Office"
-msgstr "Править информационный пункт"
+msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1645
 msgid "Museum"
 msgstr "Музей"
@@ -12983,10 +12976,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1647
 msgid "Edit Museum"
 msgstr "Править музей"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1651
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -12995,10 +12988,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:1648
+#: build/trans_presets.java:1654
 msgid "Edit Zoo"
 msgstr "Править зоопарк"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1658
 msgid "Viewpoint"
 msgstr "Смотровая площадка"
@@ -13006,25 +12999,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1660
 msgid "Edit Viewpoint"
 msgstr "Править смотровую площадку"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1663
 msgid "Look-Out Tower"
 msgstr "Каланча"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1665
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1666
 msgid "Edit Theme Park"
 msgstr "Править парк развлечений"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1670
 msgid "Artwork"
 msgstr "Рисунки"
@@ -13032,5 +13025,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1672
 msgid "Edit Artwork"
 msgstr "Редактировать рисунки"
@@ -13038,82 +13031,77 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1671
-#, fuzzy
+#: build/trans_presets.java:1677
 msgid "Guidepost (Hiking)"
-msgstr "Править туризм"
+msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1680
-#, fuzzy
+#: build/trans_presets.java:1686
 msgid "Map Type"
-msgstr "Тип"
+msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1686
 msgid "map"
 msgstr "карта"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1686
 msgid "citymap"
 msgstr "карта города"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1686
 msgid "hikingmap"
 msgstr "карта туристических маршрутов"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1686
 msgid "bicyclemap"
 msgstr "карта велодорожек"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1694
-#, fuzzy
+#: build/trans_presets.java:1687 build/trans_presets.java:1694
+#: build/trans_presets.java:1700
 msgid "Closer Description"
-msgstr "Описание"
+msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1683
-#, fuzzy
+#: build/trans_presets.java:1689
 msgid "Information Board"
-msgstr "Информация"
+msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1693
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1693
 msgid "board"
 msgstr "доска информации"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1693
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1693
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1693
 msgid "wildlife"
 msgstr "животный мир"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1690
-#, fuzzy
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
-msgstr "Править информационный пункт"
+msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
-#. item "Amenities/Hunting Stand" label "Edit a Hunting Stand"
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1696 build/trans_presets.java:2341
+#: build/trans_presets.java:1702 build/trans_presets.java:2347
 msgid "Shelter"
 msgstr "Навес"
 
 #. item
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1703
 msgid "Edit Shelter"
 msgstr "Править навес"
@@ -13121,25 +13109,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1700 build/trans_presets.java:1706
+#: build/trans_presets.java:1706 build/trans_presets.java:1712
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1708
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1709
 msgid "Edit Picnic Site"
 msgstr "Править место для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1715
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1716
 msgid "Castle"
 msgstr "Замок"
@@ -13148,20 +13136,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:1713
+#: build/trans_presets.java:1719
 msgid "Edit Castle"
 msgstr "Править замок"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1723
 msgid "Ruins"
 msgstr "Руины"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1724
 msgid "Edit Ruins"
 msgstr "Править руины"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1728
 msgid "Archaeological Site"
 msgstr "Место раскопок"
@@ -13170,20 +13158,20 @@
 #. <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:1725
+#: build/trans_presets.java:1731
 msgid "Edit Archaeological Site"
 msgstr "Править место раскопок"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1735
 msgid "Monument"
 msgstr "Монумент"
 
 #. item
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1736
 msgid "Edit Monument"
 msgstr "Править монумент"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1740
 msgid "Memorial"
 msgstr "Памятник"
@@ -13191,10 +13179,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1742
 msgid "Edit Memorial"
 msgstr "Править памятник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1746
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -13202,45 +13190,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1748
 msgid "Edit Battlefield"
 msgstr "Править поле битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1752
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item
-#: build/trans_presets.java:1747
-msgid "Edit a Wayside Cross"
+#: build/trans_presets.java:1753
+msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1757
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item
-#: build/trans_presets.java:1752
-msgid "Edit a Wayside Shrine"
+#: build/trans_presets.java:1758
+msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1763
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1764
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1765
 msgid "Edit Water Park"
 msgstr "Править аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1769
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -13248,15 +13236,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1771
 msgid "Edit Playground"
 msgstr "Править игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1775
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1776
 msgid "Edit Fishing"
 msgstr "Править рыбалку"
@@ -13264,15 +13252,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1782
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1783
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1784
 msgid "Edit Stadium"
 msgstr "Править стадион"
@@ -13286,6 +13274,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1782 build/trans_presets.java:1791
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
+#: build/trans_presets.java:1788 build/trans_presets.java:1797
+#: build/trans_presets.java:1806 build/trans_presets.java:1815
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -13653,6 +13641,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 #: build/trans_style.java:3248 build/trans_style.java:3256
 #: build/trans_style.java:3264 build/trans_style.java:3272
@@ -13684,227 +13672,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "canoe"
 msgstr "каноэ"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "climbing"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "swimming"
 msgstr "плаванье"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1784 build/trans_presets.java:1793
-#: build/trans_presets.java:1802 build/trans_presets.java:1811
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1792
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1793
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1801
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1802
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1810
 msgid "Racetrack"
 msgstr "Трэк"
 
 #. item
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1811
 msgid "Edit Racetrack"
 msgstr "Править трэк"
 
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1819
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1820
 msgid "Edit Golf Course"
 msgstr "Править поле для гольфа"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1818
+#: build/trans_presets.java:1824
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1825
 msgid "Edit Miniature Golf"
 msgstr "Править минигольф"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1831
 msgid "Multi"
 msgstr "Несколько"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1832
 msgid "Edit Multi"
 msgstr "Править несколько видов спорта"
@@ -13943,191 +13931,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1901 build/trans_presets.java:1907
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1929 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2009
-#: build/trans_presets.java:2015 build/trans_presets.java:2021
-#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1901 build/trans_presets.java:1907
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1929 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2009
-#: build/trans_presets.java:2015 build/trans_presets.java:2021
-#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1901 build/trans_presets.java:1907
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1929 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2009
-#: build/trans_presets.java:2015 build/trans_presets.java:2021
-#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "10pin"
 msgstr "10штырьковый"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1844
 msgid "Edit Athletics"
 msgstr "Править атлетику"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1850
 msgid "Edit Archery"
 msgstr "Править стрельбу из лука"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1856
 msgid "Edit Climbing"
 msgstr "Править скалолазанье"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1861
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1862
 msgid "Edit Canoeing"
 msgstr "Править каноэ"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1867
 msgid "Cycling"
 msgstr "Велоспорт"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1868
 msgid "Edit Cycling"
 msgstr "Править велоспорт"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1873
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1874
 msgid "Edit Dog Racing"
 msgstr "Править собачьи бега"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1879
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Edit Gymnastics"
 msgstr "Править гимнастику"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1898
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Skating"
 msgstr "Править фигурное катание"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1909
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1910
 msgid "Edit Skateboard"
 msgstr "Править скейтборд"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Swimming"
 msgstr "Плаванье"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1916
 msgid "Edit Swimming"
 msgstr "Править плаванье"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -14135,56 +14123,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Edit Skiing"
 msgstr "Править лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1926
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1926
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1926
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1926
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "intermedia"
 msgstr "средний"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "advance"
 msgstr "продвинутый"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1927
 msgid "freeride"
 msgstr "свободный"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Стрельба"
@@ -14192,178 +14180,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Edit Shooting"
 msgstr "Править стрельбу"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Soccer"
 msgstr "Править футбол"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Edit Football"
 msgstr "Править американский футбол"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1951
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "Edit Australian Football"
 msgstr "Править австралийский футбол"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1957
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Golf"
 msgstr "Гольф"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Edit Golf"
 msgstr "Править гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1973
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Edit Hockey"
 msgstr "Править хоккей"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Rugby"
 msgstr "Регби"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
 #. <separator/>
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2043
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Buildings"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2044
 msgid "Building"
 msgstr "Здание"
@@ -14371,5 +14359,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -14377,10 +14365,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2049
 msgid "Edit Public Building"
 msgstr "Править общественное здание"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -14388,10 +14376,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2059
 msgid "Embassy"
 msgstr "Посольство"
@@ -14399,10 +14387,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2065
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -14411,10 +14399,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:2062
+#: build/trans_presets.java:2068
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Prison"
 msgstr "Тюрьма"
@@ -14423,10 +14411,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:2069
+#: build/trans_presets.java:2075
 msgid "Edit Prison"
 msgstr "Править тюрьму"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -14436,10 +14424,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:2077
+#: build/trans_presets.java:2083
 msgid "Edit Police"
 msgstr "Править полицию"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2087
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -14448,10 +14436,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:2084
+#: build/trans_presets.java:2090
 msgid "Edit Fire Station"
 msgstr "Править пожарное депо"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -14459,5 +14447,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Edit Post Office"
 msgstr "Править почтовое отделение"
@@ -14465,15 +14453,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "School"
 msgstr "Школа"
@@ -14481,10 +14469,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Edit School"
 msgstr "Править школу"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "University"
 msgstr "Университет"
@@ -14492,10 +14480,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Edit University"
 msgstr "Править университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "College"
 msgstr "Колледж"
@@ -14503,5 +14491,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Edit College"
 msgstr "Править колледж"
@@ -14509,5 +14497,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -14516,10 +14504,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:2122
+#: build/trans_presets.java:2128
 msgid "Edit Cinema"
 msgstr "Править кинотеатр"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Library"
 msgstr "Библиотека"
@@ -14528,10 +14516,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:2129
+#: build/trans_presets.java:2135
 msgid "Edit Library"
 msgstr "Править библиотеку"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -14539,10 +14527,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2141
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Theatre"
 msgstr "Театр"
@@ -14551,10 +14539,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:2142
+#: build/trans_presets.java:2148
 msgid "Edit Theatre"
 msgstr "Править театр"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2152
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -14564,5 +14552,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:2150
+#: build/trans_presets.java:2156
 msgid "Edit Place of Worship"
 msgstr "Править место поклонения"
@@ -14571,6 +14559,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "Religion"
 msgstr "Религия"
@@ -14579,66 +14567,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "unitarianist"
 msgstr "унитаризм"
 
-#: build/trans_presets.java:2153 build/trans_presets.java:2839
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2159 build/trans_presets.java:2847
+#: build/trans_presets.java:2856
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "Denomination"
 msgstr "Конфессия"
@@ -14647,81 +14635,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2154 build/trans_presets.java:2840
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2160 build/trans_presets.java:2848
+#: build/trans_presets.java:2857
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Addresses"
 msgstr "Адреса"
@@ -14730,11 +14718,11 @@
 #. <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:2160
-msgid "Edit address information"
+#: build/trans_presets.java:2166
+msgid "Edit Address Information"
 msgstr "Править адреса"
 
-#. item "Buildings/Addresses" label "Edit address information"
+#. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2168
 msgid "House number"
 msgstr "Номер дома"
@@ -14742,25 +14730,25 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2170
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Street name"
 msgstr "Название улицы"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "City name"
 msgstr "Название города"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2174
 msgid "Country code"
 msgstr "Код страны"
@@ -14768,5 +14756,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -14775,73 +14763,73 @@
 #. <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:2174
-msgid "Edit address interpolation"
+#: build/trans_presets.java:2180
+msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
 
-#. item "Buildings/Address Interpolation" label "Edit address interpolation"
+#. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "all"
 msgstr "все"
 
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2186
 msgid "Works"
 msgstr "Цеха"
 
 #. item
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2187
 msgid "Edit Works"
 msgstr "Править цеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Tower"
 msgstr "Башня"
 
 #. item
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Edit Tower"
 msgstr "Править башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2196
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2201
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2202
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -14849,10 +14837,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2208
 msgid "Edit Lighthouse"
 msgstr "Править маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -14860,10 +14848,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2214
 msgid "Edit Windmill"
 msgstr "Править ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -14871,10 +14859,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2220
 msgid "Edit Pipeline"
 msgstr "Править трубопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2224
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -14884,10 +14872,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:2222
+#: build/trans_presets.java:2228
 msgid "Edit Wastewater Plant"
 msgstr "Править очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2232
 msgid "Crane"
 msgstr "Кран"
@@ -14895,10 +14883,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2234
 msgid "Edit Crane"
 msgstr "Править кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2238
 msgid "Beacon"
 msgstr "Буй"
@@ -14906,10 +14894,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Beacon"
 msgstr "Править буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -14917,10 +14905,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2250
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -14928,5 +14916,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Surveillance Camera"
 msgstr "Править видеонаблюдение"
@@ -14934,5 +14922,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Power Generator"
 msgstr "Генератор энергии"
@@ -14942,39 +14930,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:2255
+#: build/trans_presets.java:2261
 msgid "Edit Power Generator"
 msgstr "Править генератор энергии"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Power Station"
 msgstr "Электростанция"
@@ -14983,10 +14971,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:2263
-msgid "Edit power station"
+#: build/trans_presets.java:2269
+msgid "Edit Power Station"
 msgstr "Править электростанцию"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2273
 msgid "Power Sub Station"
 msgstr "Электроподстанция"
@@ -14995,16 +14983,16 @@
 #. <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:2270
-msgid "Edit power sub station"
+#: build/trans_presets.java:2276
+msgid "Edit Power Sub Station"
 msgstr "Править подстанцию"
 
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2273 build/trans_presets.java:2289
+#: build/trans_presets.java:2279 build/trans_presets.java:2295
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2281
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -15015,5 +15003,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:2280
+#: build/trans_presets.java:2286
 msgid "Edit Power Tower"
 msgstr "Править опору ЛЭП"
@@ -15021,5 +15009,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -15028,25 +15016,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:2286
-msgid "Edit power line"
+#: build/trans_presets.java:2292
+msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2296
 msgid "Voltage"
 msgstr "Напряжение"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Amount of Wires"
 msgstr "Количество кабелей"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Toilets"
 msgstr "Туалеты"
@@ -15054,25 +15042,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2300 build/trans_presets.java:2392
+#: build/trans_presets.java:2306 build/trans_presets.java:2398
 msgid "Reference number"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2307
 msgid "Charge"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2302 build/trans_presets.java:2393
+#: build/trans_presets.java:2308 build/trans_presets.java:2399
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2315
 msgid "Telephone"
 msgstr "Телефон"
@@ -15081,11 +15069,11 @@
 #. <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:2312
-msgid "Edit a Telephone"
+#: build/trans_presets.java:2318
+msgid "Edit Telephone"
 msgstr "Править телефон"
 
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2315 build/trans_presets.java:2394
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Coins"
 msgstr "Монеты"
@@ -15093,5 +15081,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2316 build/trans_presets.java:2395
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Notes"
 msgstr "Банкноты"
@@ -15099,5 +15087,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2317 build/trans_presets.java:2396
+#: build/trans_presets.java:2323 build/trans_presets.java:2402
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -15105,5 +15093,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2318 build/trans_presets.java:2397
+#: build/trans_presets.java:2324 build/trans_presets.java:2403
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -15111,15 +15099,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2319 build/trans_presets.java:2398
+#: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2328
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -15128,41 +15116,41 @@
 #. <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:2325
-msgid "Edit a Recycling station"
+#: build/trans_presets.java:2331
+msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
 
-#. item "Amenities/Recycling" label "Edit a Recycling station"
+#. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2334
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2337
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Bench"
 msgstr "Скамейка"
@@ -15171,20 +15159,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item
-#: build/trans_presets.java:2339
-msgid "Edit a Hunting Stand"
+#: build/trans_presets.java:2345
+msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "Lock"
 msgstr ""
@@ -15192,22 +15180,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2344 build/trans_presets.java:2734
+#: build/trans_presets.java:2350 build/trans_presets.java:2742
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2352
 msgid "Fountain"
 msgstr "Фонтан"
@@ -15216,10 +15204,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:2349
-msgid "Edit a Fountain"
+#: build/trans_presets.java:2355
+msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -15228,10 +15216,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:2356
+#: build/trans_presets.java:2362
 msgid "Edit Drinking Water"
 msgstr "Править источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Baby Hatch"
 msgstr ""
@@ -15239,25 +15227,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2362
-msgid "Edit a Baby Hatch"
+#: build/trans_presets.java:2368
+msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2374
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2375
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2380
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -15265,10 +15253,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2386
 msgid "Kiosk"
 msgstr "Киоск"
@@ -15276,10 +15264,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Kiosk"
 msgstr "Править киоск"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2392
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -15287,94 +15275,94 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2388
-msgid "Edit a Vending machine"
+#: build/trans_presets.java:2394
+msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
 
-#. item "Shops/Vending machine" label "Edit a Vending machine"
+#. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -15382,10 +15370,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2403
+#: build/trans_presets.java:2409
 msgid "Edit Butcher"
 msgstr "Править мясную лавку"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Baker"
 msgstr "Булочная"
@@ -15393,10 +15381,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Baker"
 msgstr "Править булочную"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Florist"
 msgstr "Флорист"
@@ -15404,70 +15392,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2421
 msgid "Edit Florist"
 msgstr "Редактировать флориста"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2430
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Beverages  Shop"
 msgstr "Редактировать магазин напитков"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2435
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2436
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2455
 msgid "Garden Centre"
 msgstr ""
@@ -15475,10 +15463,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2461
 msgid "Hardware"
 msgstr ""
@@ -15486,10 +15474,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -15497,60 +15485,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2473
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2488
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2489
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2493
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2498
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -15558,10 +15546,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2500
 msgid "Edit Dry Cleaning"
 msgstr "Править химчистку"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Laundry"
 msgstr "Прачечная"
@@ -15569,10 +15557,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Edit Laundry"
 msgstr "Править прачечную"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -15580,35 +15568,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2512
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "optician"
 msgstr "оптика"
 
 #. item
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Optician"
 msgstr "Править оптику"
 
 #. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2528
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Bank"
 msgstr "Банк"
@@ -15616,5 +15604,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Bank"
 msgstr "Править банк"
@@ -15622,10 +15610,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2534 build/trans_presets.java:2542
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -15633,5 +15621,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2538
 msgid "Edit Money Exchange"
 msgstr "Править обмен валют"
@@ -15639,15 +15627,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2544
 msgid "Edit Automated Teller Machine"
 msgstr "Править банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Doctors"
 msgstr "Врач"
@@ -15655,20 +15643,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Edit Doctors"
 msgstr "Править врача"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2556
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -15676,5 +15664,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Edit Pharmacy"
 msgstr "Править аптеку"
@@ -15682,10 +15670,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Hospital"
 msgstr "Больница"
@@ -15693,10 +15681,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Edit Hospital"
 msgstr "Править больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2574
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -15705,5 +15693,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:2571
+#: build/trans_presets.java:2577
 msgid "Edit Emergency Access Point"
 msgstr "Править пункт вызова экстренной помощи"
@@ -15712,15 +15700,21 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2580
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2581
+#, fuzzy
+msgid "Point Name"
+msgstr "Номер пункта"
+
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:2583
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2584
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, как например +12-345-67890)"
@@ -15728,5 +15722,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2587
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -15735,25 +15729,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:2582
+#: build/trans_presets.java:2590
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
 #. group "Places"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2597
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2590
-msgid "Edit a Continent"
+#: build/trans_presets.java:2598
+msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2603
 msgid "Country"
 msgstr "Страна"
 
 #. item
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2604
 msgid "Edit Country"
 msgstr "Править страну"
@@ -15761,45 +15755,45 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2601 build/trans_presets.java:2981
+#: build/trans_presets.java:2609 build/trans_presets.java:2989
 msgid "State"
 msgstr "Штат"
 
 #. item
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2610
 msgid "Edit State"
 msgstr "Править штат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2615
 msgid "Region"
 msgstr "Область"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2616
 msgid "Edit Region"
 msgstr "Править область"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2621
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2622
 msgid "Edit County"
 msgstr "Править графство"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2627
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2628
 msgid "Edit City"
 msgstr "Править город"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2633
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -15807,10 +15801,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2635
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2640
 msgid "Suburb"
 msgstr "Пригород"
@@ -15818,30 +15812,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2642
 msgid "Edit Suburb"
 msgstr "Править пригород"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2647
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2648
 msgid "Edit Village"
 msgstr "Править село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2653
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2654
 msgid "Edit Hamlet"
 msgstr "Править деревню"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2659
 msgid "Locality"
 msgstr "Местность"
@@ -15849,10 +15843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2661
 msgid "Edit Locality"
 msgstr "Править местность"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2666
 msgid "Island"
 msgstr "Остров"
@@ -15860,5 +15854,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2668
 msgid "Edit Island"
 msgstr "Править остров"
@@ -15866,5 +15860,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2674
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -15872,10 +15866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2676
 msgid "Edit Cave Entrance"
 msgstr "Править вход в пещеру"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2680
 msgid "Peak"
 msgstr "Вершина"
@@ -15883,10 +15877,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2682
 msgid "Edit Peak"
 msgstr "Править вершину"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2687
 msgid "Glacier"
 msgstr "Ледник"
@@ -15894,10 +15888,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2689
 msgid "Edit Glacier"
 msgstr "Править ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2694
 msgid "Volcano"
 msgstr "Вулкан"
@@ -15905,70 +15899,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2696
 msgid "Edit Volcano"
 msgstr "Править вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2702
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2703
 msgid "National"
 msgstr "Государственная"
 
 #. item
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2704
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2709
 msgid "Administrative"
 msgstr "Административная"
 
 #. item
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2710
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2715
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2716
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2721
 msgid "political"
 msgstr "Политическая"
 
 #. item
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2722
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
 #. item "Boundaries/political" text "Name"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2727
 msgid "National_park"
 msgstr "Национальный парк"
 
 #. item
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2728
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National_park" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2734
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2735
 msgid "Tree"
 msgstr "Дерево"
@@ -15977,15 +15971,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:2730
-msgid "Edit a Tree"
+#: build/trans_presets.java:2738
+msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2743
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2745
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -15994,5 +15988,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:2740
+#: build/trans_presets.java:2748
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -16000,17 +15994,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2743 build/trans_presets.java:2752
+#: build/trans_presets.java:2751 build/trans_presets.java:2760
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2743 build/trans_presets.java:2752
+#: build/trans_presets.java:2751 build/trans_presets.java:2760
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2743 build/trans_presets.java:2752
+#: build/trans_presets.java:2751 build/trans_presets.java:2760
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2753
 msgid "Forest"
 msgstr "Лес"
@@ -16019,19 +16013,19 @@
 #. <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:2748
+#: build/trans_presets.java:2756
 msgid "Edit Forest Landuse"
 msgstr "Править лес"
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2762
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2763
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2767
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -16040,70 +16034,70 @@
 #. <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:2762
+#: build/trans_presets.java:2770
 msgid "Edit Farmyard Landuse"
 msgstr "Править двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2775
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2776
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2781
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2782
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2787
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2788
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2793
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2794
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2799
 msgid "Garden"
 msgstr "Сад"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2800
 msgid "Edit Garden"
 msgstr "Править сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2804
 msgid "Grass"
 msgstr "Трава"
 
 #. item
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2805
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2810
 msgid "Village Green"
 msgstr ""
@@ -16111,10 +16105,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2812
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2817
 msgid "Common"
 msgstr "Общее"
@@ -16122,20 +16116,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2819
 msgid "Edit Common"
 msgstr "Править общее"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2823
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2824
 msgid "Edit Park"
 msgstr "Править парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2828
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -16143,5 +16137,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2830
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править спортплощадку"
@@ -16149,15 +16143,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2836
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2837
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2842
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -16165,9 +16159,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2844
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2850
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -16175,39 +16169,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2852
 msgid "Edit Cemetery Landuse"
 msgstr "Править кладбище"
 
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2859
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2860
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2865
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2866
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2871
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2872
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2877
 msgid "Railway land"
 msgstr "Железная дорога"
@@ -16215,5 +16209,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2879
 msgid "Edit Railway Landuse"
 msgstr "Править ж/д пути"
@@ -16221,60 +16215,60 @@
 #. item "Land use/Railway land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2885
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2886
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2891
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2892
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2897
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2898
 msgid "Edit Construction Landuse"
 msgstr "Править стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2903
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2904
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2909
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2910
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
 #. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2915
 msgid "Military"
 msgstr "Военное"
 
 #. item
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2916
 msgid "Edit Military Landuse"
 msgstr "Править военное"
@@ -16282,25 +16276,25 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2922
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2923
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2927
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2928
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2932
 msgid "Fell"
 msgstr ""
@@ -16308,10 +16302,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2934
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2938
 msgid "Heath"
 msgstr "Пустошь"
@@ -16319,10 +16313,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2940
 msgid "Edit Heath"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2947
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
@@ -16332,6 +16326,6 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2943
-msgid "Edit a Multipolygon"
+#: build/trans_presets.java:2951
+msgid "Edit Multipolygon"
 msgstr "Править мультиполигональное отношение"
 
@@ -16339,10 +16333,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2957
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2958
 msgid "inner segment"
 msgstr ""
@@ -16350,5 +16344,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2961
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -16357,40 +16351,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2956
-msgid "Edit a Turn Restriction"
+#: build/trans_presets.java:2964
+msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
 
-#. item "Relations/Turn restriction" label "Edit a Turn Restriction"
+#. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "only_straight_on"
 msgstr ""
@@ -16399,15 +16393,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2971
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2973
 msgid "to way"
 msgstr ""
@@ -16415,5 +16409,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2976
 msgid "Route"
 msgstr ""
@@ -16422,11 +16416,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2971
-msgid "Edit a Route"
-msgstr ""
-
-#. item "Relations/Route" label "Edit a Route"
+#: build/trans_presets.java:2979
+msgid "Edit Route"
+msgstr ""
+
+#. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "Route type"
 msgstr ""
@@ -16498,5 +16492,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2973 build/trans_style.java:206
+#: build/trans_presets.java:2981 build/trans_style.java:206
 #: build/trans_style.java:553 build/trans_style.java:743
 #: build/trans_style.java:751 build/trans_style.java:759
@@ -16505,17 +16499,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "ski"
 msgstr ""
@@ -16567,5 +16561,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2973 build/trans_style.java:220
+#: build/trans_presets.java:2981 build/trans_style.java:220
 #: build/trans_style.java:561 build/trans_style.java:569
 #: build/trans_style.java:577 build/trans_style.java:585
@@ -16573,13 +16567,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "detour"
 msgstr ""
@@ -16593,10 +16587,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2973 build/trans_style.java:1042
+#: build/trans_presets.java:2981 build/trans_style.java:1042
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Symbol description"
 msgstr ""
@@ -16604,26 +16598,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2990
 msgid "Color (hex)"
 msgstr ""
@@ -16632,30 +16626,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2994
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2996
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "backward halt point"
 msgstr ""
@@ -20348,25 +20342,4 @@
 msgstr ""
 
-#~ msgid "desc"
-#~ msgstr "описание"
-
-#~ msgid "symbol"
-#~ msgstr "символ"
-
-#~ msgid "time"
-#~ msgstr "время"
-
-#~ msgid "Signpost"
-#~ msgstr "Столб с указателями"
-
-#~ msgid "Information point"
-#~ msgstr "Информационный пункт"
-
-#~ msgid "office"
-#~ msgstr "офис"
-
-#~ msgid "guidepost"
-#~ msgstr "указатель"
-
 #~ msgid "Please select something from the conflict list."
 #~ msgstr "Пожалуйста, выберите что-либо из списка конфликтов."
@@ -20416,4 +20389,13 @@
 #~ msgstr "Загрузка GPX"
 
+#~ msgid "time"
+#~ msgstr "время"
+
+#~ msgid "desc"
+#~ msgstr "описание"
+
+#~ msgid "symbol"
+#~ msgstr "символ"
+
 #~ msgid "Upload raw file: {0}"
 #~ msgstr "Загрузить необработанный файл: {0}"
@@ -20440,4 +20422,16 @@
 #~ msgstr "Водоёмы"
 
+#~ msgid "Information point"
+#~ msgstr "Информационный пункт"
+
 #~ msgid "Natural"
 #~ msgstr "Естественное"
+
+#~ msgid "Signpost"
+#~ msgstr "Столб с указателями"
+
+#~ msgid "office"
+#~ msgstr "офис"
+
+#~ msgid "guidepost"
+#~ msgstr "указатель"