Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 26612)
+++ applications/editors/josm/i18n/po/uk.po	(revision 26613)
@@ -4,10 +4,28 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://tile.openstreetmap.org/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik B&W);tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#. <type>wms</type>
+#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Hike & Bike;tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm-->
+#. <entry>
+#. <name>Hike &amp; Bike</name>
+#: build/trans_wms.java:52 build/trans_wms.java:130
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 16:10+0200\n"
-"PO-Revision-Date: 2011-08-26 11:35+0000\n"
+"POT-Creation-Date: 2011-09-02 21:25+0200\n"
+"PO-Revision-Date: 2011-08-31 17:14+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,6 +36,6 @@
 "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: 2011-08-28 11:56+0000\n"
-"X-Generator: Launchpad (build 13794)\n"
+"X-Launchpad-Export-Date: 2011-09-02 19:18+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -27,6 +45,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -52,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
@@ -70,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:444
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -86,6 +104,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:254
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
@@ -166,6 +184,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:397
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
@@ -374,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -398,10 +416,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:109
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:157
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
@@ -414,5 +432,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:104
@@ -457,4 +475,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "Cancel"
 msgstr "Скасувати"
@@ -524,5 +543,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -568,6 +587,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
@@ -605,4 +624,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -639,5 +659,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:70
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -827,6 +847,6 @@
 msgstr "Будь ласка, виберіть принаймні дві лінії для з’єднання"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:120
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:368
@@ -835,11 +855,19 @@
 msgstr "Копіювати"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "Копіювати виділені об’єкти до буферу обміну."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:69
 msgid "Please select something to copy."
 msgstr "Будь ласка, виберіть що-небудь для копіювання."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+msgid "Copy Coordinates"
+msgstr "Копіювати координати"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+msgid "Copy coordinates of selected nodes to clipboard."
+msgstr "Копіювати координати виділених точок у буфер обміну"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
@@ -1237,5 +1265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:122
@@ -1256,4 +1284,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "OK"
 msgstr "Так"
@@ -1500,14 +1529,14 @@
 msgstr "Неможливо розібрати довготу/широту"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "Ректифіковане зображення…"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
 msgstr "Заватажити ректифіковане зображення з різноманітних сервісів"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 #, java-format
 msgid "WMS: {0}"
@@ -1518,26 +1547,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
 msgstr "WMS-посилання користувача"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:114
 msgid "Supported Rectifier Services:"
 msgstr "Підтримувані сервіси ректифікації:"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:140
 msgid "Visit Homepage"
 msgstr "Відвідати Домівку"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:151
 msgid "WMS URL or Image ID:"
 msgstr "WMS URL або ID Зображення:"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 msgid "Add Rectified Image"
 msgstr "Додати ректифіковане зображення"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:209
 msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
@@ -1547,5 +1576,5 @@
 "спробуйте знов."
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
 msgid "No valid WMS URL or id"
 msgstr "Відсутні вірні WMS URL або ідентифікатор"
@@ -1653,7 +1682,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "up"
 msgstr "вгору"
@@ -1691,7 +1720,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "down"
 msgstr "вниз"
@@ -1728,5 +1757,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:443
 msgid "Cannot move objects outside of the world."
 msgstr "Неможливо перемістити об’єкти поза межі світу."
@@ -1797,9 +1826,5 @@
 msgstr "Відкрити файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
-msgid "Opening 1 file..."
-msgstr "Відкриття 1 файлу…"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
 #, java-format
 msgid "Opening {0} file..."
@@ -1809,5 +1834,5 @@
 msgstr[2] "Відкриття {0} файлів…"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1848,5 +1873,5 @@
 msgstr "Завантажити дані"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1863,29 +1888,29 @@
 "+Q.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:184
 msgid "Orthogonalize Shape"
 msgstr "Зробити кути прямими"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:50
 msgid "Move nodes so all angles are 90 or 180 degrees"
 msgstr "Перемістити точки так, щоб всі кути стали 90 або 180 градусів"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 msgid "Orthogonalize Shape / Undo"
 msgstr "Зробити у форми кути прямими / Відмінити"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:83
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 "Відмінити переміщення точок, що були зроблені для створення прямих кутів"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Orthogonalize / Undo"
 msgstr "Зробити прямі кути / Відмінити"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:113
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1897,9 +1922,9 @@
 "прямими\"!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:115
 msgid "Undo Orthogonalize Shape"
 msgstr "Відмінити випрямлення кутів"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1912,22 +1937,22 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:153
 msgid "Selection must consist only of ways and nodes."
 msgstr "Повинні бути вибрані лише лінії та точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
 msgid "Orthogonalize"
 msgstr "Зробити кути прямими"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
 msgid "Usage"
 msgstr "Використання"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:191
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Для виділених елементів неможливо зробити прямі кути"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:279
 msgid ""
 "<html>Please make sure all selected ways head in a similar direction<br>or "
@@ -1937,5 +1962,5 @@
 "напрямок<br>або вирівнюйте їх по одній.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:419
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:432
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr "Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів."
@@ -1943,6 +1968,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
@@ -2067,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Redo"
 msgstr "Повернути"
@@ -2203,10 +2228,10 @@
 "об’єкти."
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
 msgid "Show Status Report"
 msgstr "Показати звіт про стан"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -2214,18 +2239,18 @@
 "до повідомлення про помилку"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
 #, java-format
 msgid "Help: {0}"
 msgstr "Довідка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Звіт про стан"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Скопіювати в буфер і закрити"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
@@ -2515,5 +2540,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2961,5 +2986,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -3133,8 +3158,8 @@
 "Shift: для синхронізування звуку з цією точкою."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
@@ -3149,9 +3174,9 @@
 msgstr "Вибрати"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 msgid "Select, move, scale and rotate objects"
 msgstr "Виділення, переміщення, масштабування та поворот об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:405
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -3161,17 +3186,17 @@
 msgstr[2] "Додати та перемістити нову віртуальну точку {0} ліній"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:755
 msgid "Move elements"
 msgstr "Перемістити елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Move them"
 msgstr "Перемістити"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Undo move"
 msgstr "Відмінити переміщення"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:758
 #, java-format
 msgid ""
@@ -3184,9 +3209,9 @@
 "часто призводить до виникнення помилок. Дійсно перемістити їх ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:918
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Відпустіть кнопку миші для вибору об’єктів в прямокутнику."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:920
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -3195,13 +3220,13 @@
 "об’єднання з найближчою точкою."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:922
 msgid "Release the mouse button to stop rotating."
 msgstr "Відпустіть кнопку миші, щоб зупинити обертання."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:924
 msgid "Release the mouse button to stop scaling."
 msgstr "Відпустіть кнопку миші для припинення масштабування."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:926
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3360,102 +3385,87 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
-#, fuzzy
 msgid "Special targets"
-msgstr "<u>Спеціальні цілі:</u>"
+msgstr "Спеціальні цілі"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
-#, fuzzy
-msgid ""
-"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+msgid ""
+"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
 "<b>relation</b>)"
 msgstr ""
-"<b>type:</b>object_type, де object_type — <b>node</b>(точка), <b>way</b>"
-"(ліния), <b>relation</b>(зв’язок)"
+"<b>type:</b>… - об’єкти, які відповідають типу (<b>node</b>, <b>way</b>, "
+"<b>relation</b>)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
-#, fuzzy
 msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>… — всі об’єкти, змінені користувачем"
+msgstr "<b>user:</b>… - об’єкти, які змінив користувач"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
-#, fuzzy
 msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> — все об’єкти, змінені анонімним користувачем"
+msgstr "<b>user:anonymous</b> - об’єкти змінені анонімними користувачами"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#, fuzzy
 msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>… — об’єкт із зазначеним ідентифікатором (0 для нових об’єктів)"
+msgstr "<b>id:</b>… - об’єкти зі вказаним ID (0 для нових об’єктів)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#, fuzzy
 msgid ""
 "<b>version:</b>... - objects with given version (0 objects without an "
 "assigned version)"
-msgstr ""
-"<b>версія:</b>… — Об’єкт із вказаною версією (0 для об’єктів, без "
-"встановленої версії)"
+msgstr "<b>version:</b>… - об’єкти зі вказаною версією(0 - об’єкти без версії)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
-#, fuzzy
 msgid ""
 "<b>changeset:</b>... - objects with given changeset id (0 objects without "
 "assigned changeset)"
 msgstr ""
-"<b>набір змін:</b>… — об’єкт із вказаним ідентифікатором набору змін (0 для "
-"об’єктів, без призначеного набору змін)"
+"<b>changeset:</b>… - об’єкти з вказаного набору змін (0 - об’єкти без "
+"призначеного набору змін)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
-#, fuzzy
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
-"min-max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>nodes:</b>… — об’єкт із зазначеною кількістю точок (nodes:кількість або "
-"nodes:мін-макс)"
+msgid ""
+"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
+"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
+msgstr ""
+"<b>nodes:</b>… - об’єкти з заданою кількістю точок (<b>nodes:</b>число, "
+"<b>nodes:</b>мін-макс, <b>nodes:</b>мин- або <b>nodes:</b>-макс)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
-#, fuzzy
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
-"max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>nodes:</b>… — об’єкт із зазначеною кількістю точок (nodes:кількість або "
-"nodes:мін-макс)"
+msgid ""
+"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
+"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
+msgstr ""
+"<b>tags:</b>… - об’єкти із вказаною кількістю теґів  (<b>nodes:</b>число, "
+"<b>nodes:</b>мін-макс, <b>nodes:</b>мин- або <b>nodes:</b>-макс)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
-#, fuzzy
 msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>роль:</b>… — об’єкт із зазначеною роллю у зв’язку"
+msgstr "<b>role:</b>… - об’єкти із вказаною роллю в зв’язку"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
-#, fuzzy
-msgid ""
-"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
-"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>timestamp:</b>… — об’єкт з цією часовою позначкою "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> або <b>T14:51</b> …)"
+msgid ""
+"<b>timestamp:</b>... - objects with this timestamp (2009-11-12T14:51:09Z, "
+"2009-11-12 or T14:51 ...)"
+msgstr ""
+"<b>timestamp:</b>… - об’єкти з вказаною міткою часу (2009-11-12T14:51:09Z, "
+"2009-11-12 або T14:51 …)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#, fuzzy
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
-"areasize:max)"
-msgstr ""
-"<b>areasize:</b>… — замкнена лінія з ділянкою між MIN та MAX м². (areasize:"
-"MIN-MAX або areasize:MAX)"
+msgid ""
+"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
+"max or <b>areasize:</b>max)"
+msgstr ""
+"<b>areasize:</b>... - замкнені лінії в зазначеній ділянці м² (<b>areasize:</"
+"b>мін-макс або <b>areasize:</b>макс)"
 
 #. I18n: don't translate the bold text keyword
@@ -3504,4 +3514,6 @@
 "members) in downloaded area"
 msgstr ""
+"<b>(all)indownloadedarea</b> - об’єкти (та всі точки точки ліній/члени "
+"зв’язків) у завантаженій ділянці"
 
 #. I18n: don't translate the bold text keyword
@@ -3511,4 +3523,6 @@
 "current view"
 msgstr ""
+"<b>(all)inview</b> - об’єкти (та всі точки точки ліній/члени зв’язків) у "
+"поточному виді"
 
 #. I18n: don't translate the bold text keyword
@@ -3791,5 +3805,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1710 build/trans_presets.java:3619
+#: build/trans_presets.java:1723 build/trans_presets.java:3632
 msgid "Other"
 msgstr "Інше"
@@ -4564,5 +4578,5 @@
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
@@ -4575,5 +4589,5 @@
 #. ICON(data/)
 #. light cyan
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:14
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:64
@@ -4586,5 +4600,5 @@
 #. ICON(data/)
 #. dark blue
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
@@ -4599,10 +4613,10 @@
 #. only for display, no real type
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:18
 msgid "closedway"
 msgstr "замкнена лінія"
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:16
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:19
 msgid "multipolygon"
 msgstr "мультиполігон"
@@ -4868,5 +4882,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:71
 msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr ""
+msgstr "<i>CH1903 / LV03 (без локальної корекції)</i>"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
@@ -5161,5 +5175,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4272
 msgid "Multipolygon"
 msgstr "Мультиполігон"
@@ -5500,5 +5514,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
@@ -5519,5 +5533,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:624
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:253
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:191
 msgid "Please select the row to edit."
@@ -5525,5 +5539,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:228
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
@@ -5648,11 +5662,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
-#, fuzzy
 msgid "More than one \"via\" node found"
-msgstr "Знайдено більше ніж одна лінія «через»"
+msgstr "Знайдена більше ніж одна точка \"via\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
 msgid "Cannot mix node and way for role \"via\""
-msgstr ""
+msgstr "Не можна змішувати точки та лінії у ролі \"via\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:127
@@ -5678,13 +5691,13 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:151
 msgid "The \"from\" and the first \"via\" way are not connected."
-msgstr ""
+msgstr "Лінія \"from\" та перша точка лінії \"via\" не з’єднані."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:157
 msgid "The \"via\" ways are not connected."
-msgstr ""
+msgstr "Лінії \"via\" не з’єднані."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:161
 msgid "The last \"via\" and the \"to\" way are not connected."
-msgstr ""
+msgstr "Остання лінія \"via\" та лінія \"to\" не з’єднані."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32
@@ -6002,5 +6015,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "railway"
 msgstr "залізниця"
@@ -6149,5 +6162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 msgid "Imagery"
 msgstr "Фон"
@@ -6232,10 +6245,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:172
 msgid "Username"
 msgstr "Логін"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:180
 msgid "Password"
 msgstr "Пароль"
@@ -6403,5 +6416,5 @@
 "використовується."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -6409,10 +6422,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "Вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6421,5 +6434,5 @@
 msgstr "Інструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6427,5 +6440,5 @@
 msgstr "Заготовки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6436,5 +6449,5 @@
 msgstr "Меню: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
 msgid "Audio"
 msgstr "Звук"
@@ -7293,5 +7306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:276
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
@@ -7420,5 +7433,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7686,6 +7699,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Download"
 msgstr "Завантажити"
@@ -7753,5 +7766,5 @@
 msgstr "Включити/Виключити: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:308
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
@@ -7759,9 +7772,9 @@
 "Вибір об’єктів, що є частиною цієї команди (крім вилучених до поточного часу)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:369
 msgid "Undo the selected and all later commands"
 msgstr "Відмінити виділені та всі наступні команди"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
 msgid "Redo the selected and all earlier commands"
 msgstr "Повернути виділені та всі наступні команди"
@@ -8017,7 +8030,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-#, fuzzy
 msgid "In conflict with:\n"
-msgstr "конфлікту"
+msgstr "Конфліктує з:\n"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
@@ -8239,10 +8251,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:581 build/trans_presets.java:628
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:2362 build/trans_presets.java:2709
-#: build/trans_presets.java:2710 build/trans_presets.java:2711
+#: build/trans_presets.java:581 build/trans_presets.java:640
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:2375 build/trans_presets.java:2722
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -8463,5 +8475,5 @@
 #. item "Power/Power Generator" combo "Source"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
@@ -8507,5 +8519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4271
 msgid "Relations"
 msgstr "Зв’язки"
@@ -8644,5 +8656,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:60
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62
 msgid "Selection"
 msgstr "Виділення"
@@ -9294,5 +9306,4 @@
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Rental" text "Name"
-#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
@@ -9965,175 +9976,175 @@
 #: build/trans_presets.java:503 build/trans_presets.java:519
 #: build/trans_presets.java:535 build/trans_presets.java:561
-#: build/trans_presets.java:598 build/trans_presets.java:620
-#: build/trans_presets.java:645 build/trans_presets.java:669
-#: build/trans_presets.java:690 build/trans_presets.java:711
-#: build/trans_presets.java:731 build/trans_presets.java:741
-#: build/trans_presets.java:752 build/trans_presets.java:814
-#: build/trans_presets.java:832 build/trans_presets.java:841
-#: build/trans_presets.java:914 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1097 build/trans_presets.java:1108
-#: build/trans_presets.java:1117 build/trans_presets.java:1123
-#: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:598 build/trans_presets.java:632
+#: build/trans_presets.java:657 build/trans_presets.java:681
+#: build/trans_presets.java:702 build/trans_presets.java:723
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:764 build/trans_presets.java:826
+#: build/trans_presets.java:844 build/trans_presets.java:853
+#: build/trans_presets.java:926 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1101
+#: build/trans_presets.java:1109 build/trans_presets.java:1120
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1143 build/trans_presets.java:1150
 #: build/trans_presets.java:1164 build/trans_presets.java:1171
-#: build/trans_presets.java:1176 build/trans_presets.java:1182
-#: build/trans_presets.java:1189 build/trans_presets.java:1199
-#: build/trans_presets.java:1205 build/trans_presets.java:1211
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1239
-#: build/trans_presets.java:1246 build/trans_presets.java:1252
-#: build/trans_presets.java:1269 build/trans_presets.java:1276
-#: build/trans_presets.java:1283 build/trans_presets.java:1380
-#: build/trans_presets.java:1432 build/trans_presets.java:1446
-#: build/trans_presets.java:1457 build/trans_presets.java:1470
-#: build/trans_presets.java:1483 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1519
-#: build/trans_presets.java:1530 build/trans_presets.java:1541
-#: build/trans_presets.java:1551 build/trans_presets.java:1562
-#: build/trans_presets.java:1568 build/trans_presets.java:1578
-#: build/trans_presets.java:1599 build/trans_presets.java:1631
-#: build/trans_presets.java:1641 build/trans_presets.java:1647
-#: build/trans_presets.java:1655 build/trans_presets.java:1671
-#: build/trans_presets.java:1680 build/trans_presets.java:1690
-#: build/trans_presets.java:1699 build/trans_presets.java:1723
-#: build/trans_presets.java:1731 build/trans_presets.java:1745
-#: build/trans_presets.java:1756 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:1796
-#: build/trans_presets.java:1808 build/trans_presets.java:1819
-#: build/trans_presets.java:1839 build/trans_presets.java:1854
-#: build/trans_presets.java:1862 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1954
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2005 build/trans_presets.java:2022
-#: build/trans_presets.java:2040 build/trans_presets.java:2062
-#: build/trans_presets.java:2081 build/trans_presets.java:2102
-#: build/trans_presets.java:2121 build/trans_presets.java:2138
-#: build/trans_presets.java:2157 build/trans_presets.java:2175
-#: build/trans_presets.java:2192 build/trans_presets.java:2209
-#: build/trans_presets.java:2225 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2247
-#: build/trans_presets.java:2264 build/trans_presets.java:2272
-#: build/trans_presets.java:2287 build/trans_presets.java:2297
-#: build/trans_presets.java:2309 build/trans_presets.java:2319
-#: build/trans_presets.java:2326 build/trans_presets.java:2335
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2359 build/trans_presets.java:2369
-#: build/trans_presets.java:2374 build/trans_presets.java:2382
-#: build/trans_presets.java:2389 build/trans_presets.java:2397
-#: build/trans_presets.java:2406 build/trans_presets.java:2413
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2434 build/trans_presets.java:2445
-#: build/trans_presets.java:2457 build/trans_presets.java:2463
-#: build/trans_presets.java:2470 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2546
-#: build/trans_presets.java:2556 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2583 build/trans_presets.java:2591
-#: build/trans_presets.java:2623 build/trans_presets.java:2701
-#: build/trans_presets.java:2719 build/trans_presets.java:2729
-#: build/trans_presets.java:2744 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2771
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2879 build/trans_presets.java:2888
-#: build/trans_presets.java:2896 build/trans_presets.java:2902
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2952
-#: build/trans_presets.java:2961 build/trans_presets.java:2968
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2998 build/trans_presets.java:3004
-#: build/trans_presets.java:3010 build/trans_presets.java:3016
-#: build/trans_presets.java:3022 build/trans_presets.java:3028
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1188 build/trans_presets.java:1194
+#: build/trans_presets.java:1201 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1223
+#: build/trans_presets.java:1228 build/trans_presets.java:1234
+#: build/trans_presets.java:1242 build/trans_presets.java:1251
+#: build/trans_presets.java:1258 build/trans_presets.java:1264
+#: build/trans_presets.java:1281 build/trans_presets.java:1288
+#: build/trans_presets.java:1295 build/trans_presets.java:1392
+#: build/trans_presets.java:1444 build/trans_presets.java:1458
+#: build/trans_presets.java:1469 build/trans_presets.java:1482
+#: build/trans_presets.java:1495 build/trans_presets.java:1509
+#: build/trans_presets.java:1520 build/trans_presets.java:1531
+#: build/trans_presets.java:1542 build/trans_presets.java:1553
+#: build/trans_presets.java:1563 build/trans_presets.java:1574
+#: build/trans_presets.java:1580 build/trans_presets.java:1590
+#: build/trans_presets.java:1611 build/trans_presets.java:1643
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1683
+#: build/trans_presets.java:1694 build/trans_presets.java:1703
+#: build/trans_presets.java:1712 build/trans_presets.java:1736
+#: build/trans_presets.java:1744 build/trans_presets.java:1758
+#: build/trans_presets.java:1769 build/trans_presets.java:1779
+#: build/trans_presets.java:1789 build/trans_presets.java:1809
+#: build/trans_presets.java:1821 build/trans_presets.java:1832
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:1875 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1967
+#: build/trans_presets.java:1984 build/trans_presets.java:2001
+#: build/trans_presets.java:2018 build/trans_presets.java:2035
+#: build/trans_presets.java:2053 build/trans_presets.java:2075
+#: build/trans_presets.java:2094 build/trans_presets.java:2115
+#: build/trans_presets.java:2134 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2188
+#: build/trans_presets.java:2205 build/trans_presets.java:2222
+#: build/trans_presets.java:2238 build/trans_presets.java:2245
+#: build/trans_presets.java:2253 build/trans_presets.java:2260
+#: build/trans_presets.java:2277 build/trans_presets.java:2285
+#: build/trans_presets.java:2300 build/trans_presets.java:2310
+#: build/trans_presets.java:2322 build/trans_presets.java:2332
+#: build/trans_presets.java:2339 build/trans_presets.java:2348
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2372 build/trans_presets.java:2382
+#: build/trans_presets.java:2387 build/trans_presets.java:2395
+#: build/trans_presets.java:2402 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2426
+#: build/trans_presets.java:2433 build/trans_presets.java:2439
+#: build/trans_presets.java:2447 build/trans_presets.java:2458
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2491
+#: build/trans_presets.java:2498 build/trans_presets.java:2505
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2526 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2552 build/trans_presets.java:2559
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
+#: build/trans_presets.java:2596 build/trans_presets.java:2604
+#: build/trans_presets.java:2636 build/trans_presets.java:2714
+#: build/trans_presets.java:2732 build/trans_presets.java:2742
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2784
+#: build/trans_presets.java:2793 build/trans_presets.java:2799
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2892 build/trans_presets.java:2901
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2951
+#: build/trans_presets.java:2957 build/trans_presets.java:2965
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3041
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
 #: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3080 build/trans_presets.java:3095
-#: build/trans_presets.java:3102 build/trans_presets.java:3110
-#: build/trans_presets.java:3115 build/trans_presets.java:3130
-#: build/trans_presets.java:3137 build/trans_presets.java:3149
-#: build/trans_presets.java:3159 build/trans_presets.java:3166
-#: build/trans_presets.java:3175 build/trans_presets.java:3182
-#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3074 build/trans_presets.java:3080
+#: build/trans_presets.java:3093 build/trans_presets.java:3108
+#: build/trans_presets.java:3115 build/trans_presets.java:3123
+#: build/trans_presets.java:3128 build/trans_presets.java:3143
+#: build/trans_presets.java:3150 build/trans_presets.java:3162
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3188 build/trans_presets.java:3195
 #: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3222 build/trans_presets.java:3232
-#: build/trans_presets.java:3238 build/trans_presets.java:3249
-#: build/trans_presets.java:3269 build/trans_presets.java:3325
-#: build/trans_presets.java:3331 build/trans_presets.java:3339
-#: build/trans_presets.java:3346 build/trans_presets.java:3352
-#: build/trans_presets.java:3358 build/trans_presets.java:3364
-#: build/trans_presets.java:3369 build/trans_presets.java:3374
-#: build/trans_presets.java:3379 build/trans_presets.java:3388
-#: build/trans_presets.java:3395 build/trans_presets.java:3402
-#: build/trans_presets.java:3410 build/trans_presets.java:3417
-#: build/trans_presets.java:3425 build/trans_presets.java:3434
-#: build/trans_presets.java:3442 build/trans_presets.java:3451
-#: build/trans_presets.java:3460 build/trans_presets.java:3467
-#: build/trans_presets.java:3475 build/trans_presets.java:3481
-#: build/trans_presets.java:3489 build/trans_presets.java:3497
-#: build/trans_presets.java:3504 build/trans_presets.java:3511
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3538
-#: build/trans_presets.java:3546 build/trans_presets.java:3555
-#: build/trans_presets.java:3561 build/trans_presets.java:3569
-#: build/trans_presets.java:3578 build/trans_presets.java:3585
-#: build/trans_presets.java:3591 build/trans_presets.java:3600
-#: build/trans_presets.java:3609 build/trans_presets.java:3625
-#: build/trans_presets.java:3634 build/trans_presets.java:3642
-#: build/trans_presets.java:3648 build/trans_presets.java:3654
-#: build/trans_presets.java:3662 build/trans_presets.java:3671
-#: build/trans_presets.java:3680 build/trans_presets.java:3687
-#: build/trans_presets.java:3695 build/trans_presets.java:3702
-#: build/trans_presets.java:3710 build/trans_presets.java:3718
-#: build/trans_presets.java:3726 build/trans_presets.java:3735
-#: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3760 build/trans_presets.java:3767
-#: build/trans_presets.java:3774 build/trans_presets.java:3782
-#: build/trans_presets.java:3789 build/trans_presets.java:3797
-#: build/trans_presets.java:3824 build/trans_presets.java:3830
-#: build/trans_presets.java:3836 build/trans_presets.java:3842
-#: build/trans_presets.java:3848 build/trans_presets.java:3856
-#: build/trans_presets.java:3863 build/trans_presets.java:3870
-#: build/trans_presets.java:3877 build/trans_presets.java:3884
-#: build/trans_presets.java:3892 build/trans_presets.java:3900
-#: build/trans_presets.java:3908 build/trans_presets.java:3915
-#: build/trans_presets.java:3922 build/trans_presets.java:3929
-#: build/trans_presets.java:3938 build/trans_presets.java:3947
-#: build/trans_presets.java:3955 build/trans_presets.java:3963
-#: build/trans_presets.java:3971 build/trans_presets.java:3980
-#: build/trans_presets.java:3988 build/trans_presets.java:3998
-#: build/trans_presets.java:4008 build/trans_presets.java:4017
-#: build/trans_presets.java:4023 build/trans_presets.java:4029
-#: build/trans_presets.java:4035 build/trans_presets.java:4040
-#: build/trans_presets.java:4046 build/trans_presets.java:4056
-#: build/trans_presets.java:4062 build/trans_presets.java:4068
-#: build/trans_presets.java:4074 build/trans_presets.java:4081
-#: build/trans_presets.java:4088 build/trans_presets.java:4094
-#: build/trans_presets.java:4100 build/trans_presets.java:4107
-#: build/trans_presets.java:4113 build/trans_presets.java:4118
-#: build/trans_presets.java:4125 build/trans_presets.java:4132
-#: build/trans_presets.java:4138 build/trans_presets.java:4147
-#: build/trans_presets.java:4155 build/trans_presets.java:4161
-#: build/trans_presets.java:4167 build/trans_presets.java:4174
-#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:3215 build/trans_presets.java:3221
+#: build/trans_presets.java:3235 build/trans_presets.java:3245
+#: build/trans_presets.java:3251 build/trans_presets.java:3262
+#: build/trans_presets.java:3282 build/trans_presets.java:3338
+#: build/trans_presets.java:3344 build/trans_presets.java:3352
+#: build/trans_presets.java:3359 build/trans_presets.java:3365
+#: build/trans_presets.java:3371 build/trans_presets.java:3377
+#: build/trans_presets.java:3382 build/trans_presets.java:3387
+#: build/trans_presets.java:3392 build/trans_presets.java:3401
+#: build/trans_presets.java:3408 build/trans_presets.java:3415
+#: build/trans_presets.java:3423 build/trans_presets.java:3430
+#: build/trans_presets.java:3438 build/trans_presets.java:3447
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3480
+#: build/trans_presets.java:3488 build/trans_presets.java:3494
+#: build/trans_presets.java:3502 build/trans_presets.java:3510
+#: build/trans_presets.java:3517 build/trans_presets.java:3524
+#: build/trans_presets.java:3530 build/trans_presets.java:3538
+#: build/trans_presets.java:3545 build/trans_presets.java:3551
+#: build/trans_presets.java:3559 build/trans_presets.java:3568
+#: build/trans_presets.java:3574 build/trans_presets.java:3582
+#: build/trans_presets.java:3591 build/trans_presets.java:3598
+#: build/trans_presets.java:3604 build/trans_presets.java:3613
+#: build/trans_presets.java:3622 build/trans_presets.java:3638
+#: build/trans_presets.java:3647 build/trans_presets.java:3655
+#: build/trans_presets.java:3661 build/trans_presets.java:3667
+#: build/trans_presets.java:3675 build/trans_presets.java:3684
+#: build/trans_presets.java:3693 build/trans_presets.java:3700
+#: build/trans_presets.java:3708 build/trans_presets.java:3715
+#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:3739 build/trans_presets.java:3748
+#: build/trans_presets.java:3757 build/trans_presets.java:3765
+#: build/trans_presets.java:3773 build/trans_presets.java:3780
+#: build/trans_presets.java:3787 build/trans_presets.java:3795
+#: build/trans_presets.java:3802 build/trans_presets.java:3810
+#: build/trans_presets.java:3837 build/trans_presets.java:3843
+#: build/trans_presets.java:3849 build/trans_presets.java:3855
+#: build/trans_presets.java:3861 build/trans_presets.java:3869
+#: build/trans_presets.java:3876 build/trans_presets.java:3883
+#: build/trans_presets.java:3890 build/trans_presets.java:3897
+#: build/trans_presets.java:3905 build/trans_presets.java:3913
+#: build/trans_presets.java:3921 build/trans_presets.java:3928
+#: build/trans_presets.java:3935 build/trans_presets.java:3942
+#: build/trans_presets.java:3951 build/trans_presets.java:3960
+#: build/trans_presets.java:3968 build/trans_presets.java:3976
+#: build/trans_presets.java:3984 build/trans_presets.java:3993
+#: build/trans_presets.java:4001 build/trans_presets.java:4011
+#: build/trans_presets.java:4021 build/trans_presets.java:4030
+#: build/trans_presets.java:4036 build/trans_presets.java:4042
+#: build/trans_presets.java:4048 build/trans_presets.java:4053
+#: build/trans_presets.java:4059 build/trans_presets.java:4069
+#: build/trans_presets.java:4075 build/trans_presets.java:4081
+#: build/trans_presets.java:4087 build/trans_presets.java:4094
+#: build/trans_presets.java:4101 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4120
+#: build/trans_presets.java:4126 build/trans_presets.java:4131
+#: build/trans_presets.java:4138 build/trans_presets.java:4145
+#: build/trans_presets.java:4151 build/trans_presets.java:4160
+#: build/trans_presets.java:4168 build/trans_presets.java:4174
+#: build/trans_presets.java:4180 build/trans_presets.java:4187
 #: build/trans_presets.java:4195 build/trans_presets.java:4201
-#: build/trans_presets.java:4207 build/trans_presets.java:4213
-#: build/trans_presets.java:4219 build/trans_presets.java:4266
-#: build/trans_presets.java:4280 build/trans_presets.java:4299
-#: build/trans_presets.java:4318 build/trans_presets.java:4348
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4208 build/trans_presets.java:4214
+#: build/trans_presets.java:4220 build/trans_presets.java:4226
+#: build/trans_presets.java:4232 build/trans_presets.java:4279
+#: build/trans_presets.java:4293 build/trans_presets.java:4312
+#: build/trans_presets.java:4331 build/trans_presets.java:4361
+#: build/trans_presets.java:4386
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -10707,5 +10718,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgid "Position"
 msgstr "Розташування"
@@ -11324,25 +11335,25 @@
 msgstr "Перейменувати вибрану закладку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lat"
 msgstr "мін. шир."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "min lon"
 msgstr "мін. довг."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lat"
 msgstr "макс. шир."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
 msgid "max lon"
 msgstr "макс. довг."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "Clear textarea"
 msgstr "Очистити поле тексту"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -11352,57 +11363,57 @@
 "ділянки)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
 msgid "Bounding Box"
 msgstr "Габаритний прямокутник"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
 msgstr "Рядок ''{0}''не є правильним подвійним значенням."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Значення широти має бути в межах [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Значення довготи має бути в межах [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232
 msgid "Paste URL from clipboard"
 msgstr "Вставити URL з буфера обміну"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
 msgstr "Джерела і типи даних:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "OpenStreetMap data"
 msgstr "Дані OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
 msgid "Select to download OSM data in the selected download area."
 msgstr "Позначте, щоб завантажити з сервера OSM дані, для виділеної ділянки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
 msgid "Raw GPS data"
 msgstr "Дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download GPS traces in the selected download area."
 msgstr "Позначте, щоб завантажити з сервера GPS-треки, для виділеної ділянки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:127
 msgid "Download as new layer"
 msgstr "Завантажити як новий шар"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:128
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
@@ -11412,29 +11423,29 @@
 "щоб завантажити дані у поточний активний шар.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:200
 msgid "No area selected yet"
 msgstr "Ділянку досі не вибрано"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:203
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Ділянка для завантаження надто велика; можлива відмова від сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Розмір ділянки для завантаження прийнятний для сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:359
 msgid "Click to close the dialog and to abort downloading"
 msgstr "Натисніть, щоб закрити діалог та припинити завантаження"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
 msgid "Click to download the currently selected area"
 msgstr "Клацніть, щоб завантажити виділену ділянку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:383
 msgid "Please select a download area first."
 msgstr "Будь ласка, виберіть спочатку ділянку для завантаження"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
 #, java-format
 msgid ""
@@ -11524,12 +11535,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: build/specialmessages.java:84 build/trans_presets.java:480
-#: build/trans_presets.java:787 build/trans_presets.java:796
-#: build/trans_presets.java:1200 build/trans_presets.java:1580
-#: build/trans_presets.java:1692 build/trans_presets.java:2447
-#: build/trans_presets.java:2682 build/trans_presets.java:2726
-#: build/trans_presets.java:2954 build/trans_presets.java:2963
-#: build/trans_presets.java:3123 build/trans_presets.java:3239
-#: build/trans_presets.java:3999 build/trans_presets.java:4009
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:799 build/trans_presets.java:808
+#: build/trans_presets.java:1212 build/trans_presets.java:1592
+#: build/trans_presets.java:1705 build/trans_presets.java:2460
+#: build/trans_presets.java:2695 build/trans_presets.java:2739
+#: build/trans_presets.java:2967 build/trans_presets.java:2976
+#: build/trans_presets.java:3136 build/trans_presets.java:3252
+#: build/trans_presets.java:4012 build/trans_presets.java:4022
+#: build/trans_presets.java:4031
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -12067,5 +12078,5 @@
 msgstr "Закриття набору змін {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:103
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
@@ -12075,21 +12086,21 @@
 "вікон. Виявлена помилка безпеки."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:109
 msgid "Enter credentials for OSM API"
 msgstr "Введіть облікові дані для OSM API"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:116
 msgid "Enter credentials for HTTP proxy"
 msgstr "Введіть облікові дані для проксі HTTP"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the user name of your OSM account"
 msgstr "Будь ласка, введіть ім’я користувача для вашого облікового запису OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:246
 msgid "Please enter the password of your OSM account"
 msgstr "Будь ласка, введіть ваш пароль до облікового запису OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:248
 #, java-format
 msgid ""
@@ -12100,18 +12111,18 @@
 "користувача і правильний пароль."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:250
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Увага: Пароль передається незашифрованим."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr ""
 "Будь ласка, введіть ім’я користувача для автентифікації на проксі-сервері"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:264
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr "Будь ласка, введіть пароль для автентифікації на проксі-сервері"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:266
 #, java-format
 msgid ""
@@ -12122,5 +12133,5 @@
 "ім’я користувача і правильний пароль."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:268
 msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
@@ -12130,13 +12141,13 @@
 "використовує проксі-сервер, може бути переданий в незашифрованому вигляді."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate"
 msgstr "Автентифікація"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:335
 msgid "Authenticate with the supplied username and password"
 msgstr "Автентифікація із наданим іменем користувача та паролем"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:349
 msgid "Cancel authentication"
 msgstr "Скасування автентифікації"
@@ -12459,10 +12470,10 @@
 #: build/trans_presets.java:504 build/trans_presets.java:520
 #: build/trans_presets.java:545 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:629
-#: build/trans_presets.java:653 build/trans_presets.java:678
-#: build/trans_presets.java:698 build/trans_presets.java:719
-#: build/trans_presets.java:1074 build/trans_presets.java:1082
-#: build/trans_presets.java:1090 build/trans_presets.java:1098
-#: build/trans_presets.java:1109 build/trans_presets.java:1386
+#: build/trans_presets.java:606 build/trans_presets.java:641
+#: build/trans_presets.java:665 build/trans_presets.java:690
+#: build/trans_presets.java:710 build/trans_presets.java:731
+#: build/trans_presets.java:1086 build/trans_presets.java:1094
+#: build/trans_presets.java:1102 build/trans_presets.java:1110
+#: build/trans_presets.java:1121 build/trans_presets.java:1398
 msgid "Layer"
 msgstr "Рівень"
@@ -13007,5 +13018,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
-#: build/trans_presets.java:4321 build/trans_presets.java:4351
+#: build/trans_presets.java:4334 build/trans_presets.java:4364
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -14946,13 +14957,13 @@
 msgstr "Типове значення не відоме (параметр ще не використовувався)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:241
 msgid "Enter a new key/value pair"
 msgstr "Введіть нову пару ключ/значення"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:263
 msgid "Change a key/value pair"
 msgstr "Змінити пару ключ/значення"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:281
 msgid "Values"
 msgstr "Значення"
@@ -15349,5 +15360,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1584
 msgid "Car"
 msgstr "Автомобіль"
@@ -15374,13 +15385,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:452 build/trans_presets.java:579
-#: build/trans_presets.java:858 build/trans_presets.java:868
-#: build/trans_presets.java:877 build/trans_presets.java:889
-#: build/trans_presets.java:903 build/trans_presets.java:925
-#: build/trans_presets.java:968 build/trans_presets.java:981
-#: build/trans_presets.java:993 build/trans_presets.java:1005
-#: build/trans_presets.java:1017 build/trans_presets.java:1029
-#: build/trans_presets.java:1039 build/trans_presets.java:1048
-#: build/trans_presets.java:1057 build/trans_presets.java:1718
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:870 build/trans_presets.java:880
+#: build/trans_presets.java:889 build/trans_presets.java:901
+#: build/trans_presets.java:915 build/trans_presets.java:937
+#: build/trans_presets.java:980 build/trans_presets.java:993
+#: build/trans_presets.java:1005 build/trans_presets.java:1017
+#: build/trans_presets.java:1029 build/trans_presets.java:1041
+#: build/trans_presets.java:1051 build/trans_presets.java:1060
+#: build/trans_presets.java:1069 build/trans_presets.java:1731
+#: build/trans_presets.java:1811
 msgid "Bicycle"
 msgstr "Велосипедом"
@@ -15420,12 +15431,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:448 build/trans_presets.java:578
-#: build/trans_presets.java:857 build/trans_presets.java:867
-#: build/trans_presets.java:876 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:967 build/trans_presets.java:980
-#: build/trans_presets.java:992 build/trans_presets.java:1004
-#: build/trans_presets.java:1016 build/trans_presets.java:1028
-#: build/trans_presets.java:1038 build/trans_presets.java:1047
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:869 build/trans_presets.java:879
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:914 build/trans_presets.java:936
+#: build/trans_presets.java:979 build/trans_presets.java:992
+#: build/trans_presets.java:1004 build/trans_presets.java:1016
+#: build/trans_presets.java:1028 build/trans_presets.java:1040
+#: build/trans_presets.java:1050 build/trans_presets.java:1059
+#: build/trans_presets.java:1068
 msgid "Foot"
 msgstr "Пішки"
@@ -17124,21 +17135,21 @@
 msgstr "Шукати в теґах"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:68
 msgid "Min. latitude"
 msgstr "Мін. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:70
 msgid "Min. longitude"
 msgstr "Мін. довгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:72
 msgid "Max. latitude"
 msgstr "Макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:74
 msgid "Max. longitude"
 msgstr "Макс. довгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:84
 msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
@@ -17954,5 +17965,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
 msgid "OSM Server Files"
 msgstr "Файли сервера OSM"
@@ -17986,9 +17997,18 @@
 msgstr "Розбір даних історії OSM…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java:40
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr "Не існує файлу \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+#, java-format
+msgid "No data found in file {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+msgid "Open OSM file"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
@@ -18080,5 +18100,5 @@
 msgstr "Відсутні ключ або значення теґу"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
@@ -18087,5 +18107,5 @@
 msgstr "Невизначений елемент ''{0}'' знайдений у вхідному потоці. Пропущено."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
@@ -18093,6 +18113,6 @@
 msgstr "Неприпустимий об’єкт з ід=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -18107,8 +18127,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
@@ -18124,5 +18144,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
@@ -18130,5 +18150,5 @@
 msgstr "Невідома чи непідтримувана версія API. Отримано {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
@@ -18137,6 +18157,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
@@ -18152,6 +18172,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
@@ -18162,5 +18182,5 @@
 msgstr "Неприпустиме значення для атрибуту ''changeset''. Отримано {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
@@ -18169,5 +18189,5 @@
 msgstr "Відсутній обов’язковий атрибут ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
@@ -18176,5 +18196,5 @@
 msgstr "Неприпустима довжина значення атрибуту ''{0}''. Отримано ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
 #, java-format
@@ -18185,5 +18205,5 @@
 "зовнішнім ідентифікатором ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
 #, java-format
@@ -18191,5 +18211,5 @@
 msgstr "Вилучена точка {0} є частиною лінії {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
 #, java-format
@@ -18201,5 +18221,5 @@
 "відсутня у завантажених даних."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
 #, java-format
@@ -18211,5 +18231,5 @@
 "зовнішнім ідентифікатором ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
 #, java-format
@@ -18217,17 +18237,17 @@
 msgstr "Вилучений член {0} входить до складу зв’язку {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Prepare OSM data..."
 msgstr "Підготовка OSM-даних…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
 msgid "Parsing OSM data..."
 msgstr "Розбір даних OSM…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
 msgid "Preparing data set..."
 msgstr "Підготовка даних…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
@@ -19005,13 +19025,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Do nothing"
 msgstr "Нічого не робити"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Report Bug"
 msgstr "Повідомити про помилку"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -19022,9 +19042,9 @@
 "ви запускаєте останню<br>версію JOSM, будь ласка, надішліть звіт про помилку."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "Unexpected Exception"
 msgstr "Непередбачена помилка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:109
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -19034,5 +19054,5 @@
 "переконайтеся, що у вас здійснено оновлення до останньої версії JOSM тут:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:118
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:113
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -19042,5 +19062,5 @@
 "ласка, повідомте про помилку на баг-трекері, використовуючи це посилання:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -19052,5 +19072,5 @@
 "це настільки детально, наскільки це можливо."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -19060,9 +19080,9 @@
 "URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Текст вже скопійовано у буфер обміну)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:139
 msgid "You have encountered a bug in JOSM"
 msgstr "Ви зіткнулися з помилкою в JOSM"
@@ -19334,5 +19354,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -20214,7 +20234,6 @@
 #. Plugin multipoly-convert
 #: build/trans_plugins.java:83
-#, fuzzy
 msgid "Simply convert an area to a multipolygon."
-msgstr "Перетворити на мультіполігон."
+msgstr "Просте перетворення ділянки у мультиполігон."
 
 #. Plugin namemanager
@@ -20653,9 +20672,9 @@
 #: build/trans_presets.java:173 build/trans_presets.java:194
 #: build/trans_presets.java:236 build/trans_presets.java:258
-#: build/trans_presets.java:1875 build/trans_presets.java:1883
-#: build/trans_presets.java:1891 build/trans_presets.java:1925
-#: build/trans_presets.java:2730 build/trans_presets.java:3271
-#: build/trans_presets.java:3287 build/trans_presets.java:4319
-#: build/trans_presets.java:4349
+#: build/trans_presets.java:1888 build/trans_presets.java:1896
+#: build/trans_presets.java:1904 build/trans_presets.java:1938
+#: build/trans_presets.java:2743 build/trans_presets.java:3284
+#: build/trans_presets.java:3300 build/trans_presets.java:4332
+#: build/trans_presets.java:4362
 msgid "Reference"
 msgstr "Позначення"
@@ -20709,5 +20728,5 @@
 #: build/trans_presets.java:505 build/trans_presets.java:521
 #: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1400
 msgid "Max. speed (km/h)"
 msgstr "Макс. швидкість (км/г)"
@@ -20741,4 +20760,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Cycle Lane" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
@@ -20757,6 +20777,7 @@
 #: build/trans_presets.java:544 build/trans_presets.java:577
 #: build/trans_presets.java:600 build/trans_presets.java:622
-#: build/trans_presets.java:647 build/trans_presets.java:671
-#: build/trans_presets.java:713 build/trans_presets.java:1381
+#: build/trans_presets.java:634 build/trans_presets.java:659
+#: build/trans_presets.java:683 build/trans_presets.java:725
+#: build/trans_presets.java:1393
 msgid "Oneway"
 msgstr "Односторонній рух"
@@ -20807,8 +20828,8 @@
 #: build/trans_presets.java:494 build/trans_presets.java:501
 #: build/trans_presets.java:539 build/trans_presets.java:572
-#: build/trans_presets.java:601 build/trans_presets.java:623
-#: build/trans_presets.java:648 build/trans_presets.java:672
-#: build/trans_presets.java:692 build/trans_presets.java:714
-#: build/trans_presets.java:1382 build/trans_surveyor.java:12
+#: build/trans_presets.java:601 build/trans_presets.java:635
+#: build/trans_presets.java:660 build/trans_presets.java:684
+#: build/trans_presets.java:704 build/trans_presets.java:726
+#: build/trans_presets.java:1394 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Міст"
@@ -20851,7 +20872,7 @@
 #: build/trans_presets.java:511 build/trans_presets.java:540
 #: build/trans_presets.java:573 build/trans_presets.java:602
-#: build/trans_presets.java:624 build/trans_presets.java:649
-#: build/trans_presets.java:673 build/trans_presets.java:693
-#: build/trans_presets.java:715 build/trans_presets.java:1383
+#: build/trans_presets.java:636 build/trans_presets.java:661
+#: build/trans_presets.java:685 build/trans_presets.java:705
+#: build/trans_presets.java:727 build/trans_presets.java:1395
 msgid "Tunnel"
 msgstr "Тунель"
@@ -20891,8 +20912,8 @@
 #: build/trans_presets.java:427 build/trans_presets.java:486
 #: build/trans_presets.java:541 build/trans_presets.java:574
-#: build/trans_presets.java:603 build/trans_presets.java:625
-#: build/trans_presets.java:650 build/trans_presets.java:674
-#: build/trans_presets.java:694 build/trans_presets.java:716
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:603 build/trans_presets.java:637
+#: build/trans_presets.java:662 build/trans_presets.java:686
+#: build/trans_presets.java:706 build/trans_presets.java:728
+#: build/trans_presets.java:1396
 msgid "Cutting"
 msgstr "Виїмка"
@@ -20932,8 +20953,8 @@
 #: build/trans_presets.java:428 build/trans_presets.java:487
 #: build/trans_presets.java:542 build/trans_presets.java:575
-#: build/trans_presets.java:604 build/trans_presets.java:626
-#: build/trans_presets.java:651 build/trans_presets.java:675
-#: build/trans_presets.java:695 build/trans_presets.java:717
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:604 build/trans_presets.java:638
+#: build/trans_presets.java:663 build/trans_presets.java:687
+#: build/trans_presets.java:707 build/trans_presets.java:729
+#: build/trans_presets.java:1397
 msgid "Embankment"
 msgstr "Насип"
@@ -20973,8 +20994,8 @@
 #: build/trans_presets.java:408 build/trans_presets.java:429
 #: build/trans_presets.java:543 build/trans_presets.java:576
-#: build/trans_presets.java:605 build/trans_presets.java:627
-#: build/trans_presets.java:652 build/trans_presets.java:676
-#: build/trans_presets.java:696 build/trans_presets.java:718
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:605 build/trans_presets.java:639
+#: build/trans_presets.java:664 build/trans_presets.java:688
+#: build/trans_presets.java:708 build/trans_presets.java:730
+#: build/trans_presets.java:2352
 msgid "Lit"
 msgstr "Освітлення"
@@ -21076,7 +21097,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "Incline"
 msgstr "Нахил"
@@ -21112,9 +21133,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -21148,9 +21169,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10%"
-msgstr ""
+msgstr "-10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -21184,9 +21205,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10°"
-msgstr ""
+msgstr "10°"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -21220,9 +21241,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10°"
-msgstr ""
+msgstr "-10°"
 
 #. </optional>
@@ -21293,5 +21314,5 @@
 #. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:288 build/trans_presets.java:373
-#: build/trans_presets.java:677 build/trans_presets.java:697
+#: build/trans_presets.java:689 build/trans_presets.java:709
 msgid "Passing Places"
 msgstr "Місце роз’їзду"
@@ -21324,9 +21345,9 @@
 #: build/trans_presets.java:507 build/trans_presets.java:522
 #: build/trans_presets.java:550 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:630
-#: build/trans_presets.java:654 build/trans_presets.java:679
-#: build/trans_presets.java:699 build/trans_presets.java:720
-#: build/trans_presets.java:1389 build/trans_presets.java:1786
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:608 build/trans_presets.java:642
+#: build/trans_presets.java:666 build/trans_presets.java:691
+#: build/trans_presets.java:711 build/trans_presets.java:732
+#: build/trans_presets.java:1401 build/trans_presets.java:1799
+#: build/trans_presets.java:1844
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -21370,7 +21391,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "Surface"
 msgstr "Поверхня"
@@ -21397,7 +21418,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "paved"
 msgstr "з покриттям"
@@ -21422,8 +21443,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "unpaved"
 msgstr "без покриття"
@@ -21448,8 +21469,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "asphalt"
 msgstr "асфальт"
@@ -21476,7 +21497,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "concrete"
 msgstr "бетон"
@@ -21502,8 +21523,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2707
 msgid "metal"
 msgstr "метал"
@@ -21530,9 +21551,9 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2384
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2397
+#: build/trans_presets.java:2707
 msgid "wood"
 msgstr "деревина"
@@ -21557,8 +21578,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "paving_stones"
 msgstr "дорожні_камені"
@@ -21585,7 +21606,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "cobblestone"
 msgstr "бруківка"
@@ -21612,7 +21633,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "gravel"
 msgstr "гравій"
@@ -21637,8 +21658,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "pebblestone"
 msgstr "галька"
@@ -21663,8 +21684,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "compacted"
 msgstr "утрамбоване"
@@ -21689,8 +21710,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "grass_paver"
 msgstr "бруківка з травою"
@@ -21717,7 +21738,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "grass"
 msgstr "трава"
@@ -21744,7 +21765,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "sand"
 msgstr "пісок"
@@ -21772,8 +21793,8 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:2676
 msgid "ground"
 msgstr "грунт"
@@ -22081,59 +22102,59 @@
 #: build/trans_presets.java:580 build/trans_presets.java:581
 #: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:628
-#: build/trans_presets.java:796 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1585 build/trans_presets.java:1586
-#: build/trans_presets.java:1587 build/trans_presets.java:1602
-#: build/trans_presets.java:1693 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1707
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
-#: build/trans_presets.java:1820 build/trans_presets.java:1821
-#: build/trans_presets.java:1822 build/trans_presets.java:1940
-#: build/trans_presets.java:1941 build/trans_presets.java:1942
-#: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:1959 build/trans_presets.java:1960
-#: build/trans_presets.java:1961 build/trans_presets.java:1974
-#: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1991
-#: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:1994 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2026
-#: build/trans_presets.java:2027 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2043
-#: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2049
-#: build/trans_presets.java:2065 build/trans_presets.java:2066
-#: build/trans_presets.java:2067 build/trans_presets.java:2068
-#: build/trans_presets.java:2088 build/trans_presets.java:2089
-#: build/trans_presets.java:2090 build/trans_presets.java:2091
-#: build/trans_presets.java:2107 build/trans_presets.java:2108
-#: build/trans_presets.java:2109 build/trans_presets.java:2110
-#: build/trans_presets.java:2124 build/trans_presets.java:2125
-#: build/trans_presets.java:2126 build/trans_presets.java:2127
-#: build/trans_presets.java:2143 build/trans_presets.java:2144
-#: build/trans_presets.java:2145 build/trans_presets.java:2146
-#: build/trans_presets.java:2162 build/trans_presets.java:2163
-#: build/trans_presets.java:2164 build/trans_presets.java:2165
-#: build/trans_presets.java:2178 build/trans_presets.java:2179
-#: build/trans_presets.java:2180 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2196
-#: build/trans_presets.java:2197 build/trans_presets.java:2198
-#: build/trans_presets.java:2212 build/trans_presets.java:2213
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2362 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:584 build/trans_presets.java:640
+#: build/trans_presets.java:808 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1593 build/trans_presets.java:1594
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:1599 build/trans_presets.java:1614
+#: build/trans_presets.java:1706 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1833 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1953
+#: build/trans_presets.java:1954 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1974 build/trans_presets.java:1987
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:2004
+#: build/trans_presets.java:2005 build/trans_presets.java:2006
+#: build/trans_presets.java:2007 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2039
+#: build/trans_presets.java:2040 build/trans_presets.java:2041
+#: build/trans_presets.java:2042 build/trans_presets.java:2056
+#: build/trans_presets.java:2057 build/trans_presets.java:2058
+#: build/trans_presets.java:2059 build/trans_presets.java:2062
+#: build/trans_presets.java:2078 build/trans_presets.java:2079
+#: build/trans_presets.java:2080 build/trans_presets.java:2081
+#: build/trans_presets.java:2101 build/trans_presets.java:2102
+#: build/trans_presets.java:2103 build/trans_presets.java:2104
+#: build/trans_presets.java:2120 build/trans_presets.java:2121
+#: build/trans_presets.java:2122 build/trans_presets.java:2123
+#: build/trans_presets.java:2137 build/trans_presets.java:2138
+#: build/trans_presets.java:2139 build/trans_presets.java:2140
+#: build/trans_presets.java:2156 build/trans_presets.java:2157
+#: build/trans_presets.java:2158 build/trans_presets.java:2159
+#: build/trans_presets.java:2175 build/trans_presets.java:2176
+#: build/trans_presets.java:2177 build/trans_presets.java:2178
+#: build/trans_presets.java:2191 build/trans_presets.java:2192
+#: build/trans_presets.java:2193 build/trans_presets.java:2194
+#: build/trans_presets.java:2208 build/trans_presets.java:2209
+#: build/trans_presets.java:2210 build/trans_presets.java:2211
+#: build/trans_presets.java:2225 build/trans_presets.java:2226
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2375 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -22295,5 +22316,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:169
 msgid "permissive"
@@ -22340,5 +22361,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:174
 msgid "private"
@@ -22525,55 +22546,55 @@
 #: build/trans_presets.java:581 build/trans_presets.java:582
 #: build/trans_presets.java:583 build/trans_presets.java:584
-#: build/trans_presets.java:628 build/trans_presets.java:765
-#: build/trans_presets.java:787 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1412 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:1602 build/trans_presets.java:1693
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1707 build/trans_presets.java:1708
-#: build/trans_presets.java:1709 build/trans_presets.java:1820
-#: build/trans_presets.java:1821 build/trans_presets.java:1822
-#: build/trans_presets.java:1940 build/trans_presets.java:1941
-#: build/trans_presets.java:1942 build/trans_presets.java:1943
-#: build/trans_presets.java:1958 build/trans_presets.java:1959
-#: build/trans_presets.java:1960 build/trans_presets.java:1961
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:1994
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2026 build/trans_presets.java:2027
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2043 build/trans_presets.java:2044
-#: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2049 build/trans_presets.java:2065
-#: build/trans_presets.java:2066 build/trans_presets.java:2067
-#: build/trans_presets.java:2068 build/trans_presets.java:2088
-#: build/trans_presets.java:2089 build/trans_presets.java:2090
-#: build/trans_presets.java:2091 build/trans_presets.java:2107
-#: build/trans_presets.java:2108 build/trans_presets.java:2109
-#: build/trans_presets.java:2110 build/trans_presets.java:2124
-#: build/trans_presets.java:2125 build/trans_presets.java:2126
-#: build/trans_presets.java:2127 build/trans_presets.java:2143
-#: build/trans_presets.java:2144 build/trans_presets.java:2145
-#: build/trans_presets.java:2146 build/trans_presets.java:2162
-#: build/trans_presets.java:2163 build/trans_presets.java:2164
-#: build/trans_presets.java:2165 build/trans_presets.java:2178
-#: build/trans_presets.java:2179 build/trans_presets.java:2180
-#: build/trans_presets.java:2181 build/trans_presets.java:2195
-#: build/trans_presets.java:2196 build/trans_presets.java:2197
-#: build/trans_presets.java:2198 build/trans_presets.java:2212
-#: build/trans_presets.java:2213 build/trans_presets.java:2291
-#: build/trans_presets.java:2301 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:640 build/trans_presets.java:777
+#: build/trans_presets.java:799 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1424 build/trans_presets.java:1593
+#: build/trans_presets.java:1594 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:1614 build/trans_presets.java:1706
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1722 build/trans_presets.java:1833
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#: build/trans_presets.java:1987 build/trans_presets.java:1988
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2022 build/trans_presets.java:2023
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2039 build/trans_presets.java:2040
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2056 build/trans_presets.java:2057
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2062 build/trans_presets.java:2078
+#: build/trans_presets.java:2079 build/trans_presets.java:2080
+#: build/trans_presets.java:2081 build/trans_presets.java:2101
+#: build/trans_presets.java:2102 build/trans_presets.java:2103
+#: build/trans_presets.java:2104 build/trans_presets.java:2120
+#: build/trans_presets.java:2121 build/trans_presets.java:2122
+#: build/trans_presets.java:2123 build/trans_presets.java:2137
+#: build/trans_presets.java:2138 build/trans_presets.java:2139
+#: build/trans_presets.java:2140 build/trans_presets.java:2156
+#: build/trans_presets.java:2157 build/trans_presets.java:2158
+#: build/trans_presets.java:2159 build/trans_presets.java:2175
+#: build/trans_presets.java:2176 build/trans_presets.java:2177
+#: build/trans_presets.java:2178 build/trans_presets.java:2191
+#: build/trans_presets.java:2192 build/trans_presets.java:2193
+#: build/trans_presets.java:2194 build/trans_presets.java:2208
+#: build/trans_presets.java:2209 build/trans_presets.java:2210
+#: build/trans_presets.java:2211 build/trans_presets.java:2225
+#: build/trans_presets.java:2226 build/trans_presets.java:2304
+#: build/trans_presets.java:2314 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3238
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -22665,10 +22686,10 @@
 #. item "Barriers/Sally Port" check "Horse"
 #: build/trans_presets.java:449 build/trans_presets.java:580
-#: build/trans_presets.java:859 build/trans_presets.java:869
-#: build/trans_presets.java:878 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:969
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1006 build/trans_presets.java:1018
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:871 build/trans_presets.java:881
+#: build/trans_presets.java:890 build/trans_presets.java:916
+#: build/trans_presets.java:938 build/trans_presets.java:981
+#: build/trans_presets.java:994 build/trans_presets.java:1006
+#: build/trans_presets.java:1018 build/trans_presets.java:1030
+#: build/trans_presets.java:1070
 msgid "Horse"
 msgstr "Конем"
@@ -22706,11 +22727,11 @@
 #. group "Motorcycle"
 #: build/trans_presets.java:454 build/trans_presets.java:548
-#: build/trans_presets.java:860 build/trans_presets.java:870
-#: build/trans_presets.java:879 build/trans_presets.java:890
-#: build/trans_presets.java:905 build/trans_presets.java:927
-#: build/trans_presets.java:970 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1019 build/trans_presets.java:1059
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:872 build/trans_presets.java:882
+#: build/trans_presets.java:891 build/trans_presets.java:902
+#: build/trans_presets.java:917 build/trans_presets.java:939
+#: build/trans_presets.java:982 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1031 build/trans_presets.java:1071
+#: build/trans_presets.java:1699
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -22729,9 +22750,9 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #: build/trans_presets.java:455 build/trans_presets.java:549
-#: build/trans_presets.java:584 build/trans_presets.java:891
-#: build/trans_presets.java:906 build/trans_presets.java:928
-#: build/trans_presets.java:971 build/trans_presets.java:984
-#: build/trans_presets.java:996 build/trans_presets.java:1008
-#: build/trans_presets.java:1020 build/trans_presets.java:1060
+#: build/trans_presets.java:584 build/trans_presets.java:903
+#: build/trans_presets.java:918 build/trans_presets.java:940
+#: build/trans_presets.java:983 build/trans_presets.java:996
+#: build/trans_presets.java:1008 build/trans_presets.java:1020
+#: build/trans_presets.java:1032 build/trans_presets.java:1072
 msgid "Motorcar"
 msgstr "Автомобіль"
@@ -22819,4 +22840,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. </rule>
 #.
@@ -22830,15 +22852,17 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:480 build/trans_style.java:417
-#: build/trans_style.java:423
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:417 build/trans_style.java:423
 msgid "motorway"
 msgstr "автомагістраль"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "motorway_link"
 msgstr "з’їзд з/на автомагістраль"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -22853,15 +22877,17 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:480 build/trans_style.java:429
-#: build/trans_style.java:435
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:429 build/trans_style.java:435
 msgid "trunk"
 msgstr "шосе"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "trunk_link"
 msgstr "з’їзд з/на шосе"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -22876,15 +22902,17 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:480 build/trans_style.java:441
-#: build/trans_style.java:447
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:441 build/trans_style.java:447
 msgid "primary"
 msgstr "головна дорога"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "primary_link"
 msgstr "з’їзд з/на головну"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -22899,10 +22927,11 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:480 build/trans_style.java:453
-#: build/trans_style.java:459
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:453 build/trans_style.java:459
 msgid "secondary"
 msgstr "другорядна дорога"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -22917,15 +22946,17 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:480 build/trans_style.java:465
-#: build/trans_style.java:471
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:465 build/trans_style.java:471
 msgid "tertiary"
 msgstr "третинна"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "unclassified"
 msgstr "дорога без класифікації"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon src="misc/landmark/plant.png"/>
 #. </rule>
@@ -22934,14 +22965,17 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:480 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:2748
 msgid "residential"
 msgstr "місцевого значення"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "living_street"
 msgstr "жила зона"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -22977,15 +23011,17 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:480 build/trans_style.java:513
-#: build/trans_style.java:3662
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:513 build/trans_style.java:3662
 msgid "service"
 msgstr "службова"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "bus_guideway"
 msgstr "моно-рейка"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. </rule>
@@ -23005,6 +23041,7 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:480 build/trans_style.java:698
-#: build/trans_style.java:2803 build/trans_style.java:2804
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:698 build/trans_style.java:2803
+#: build/trans_style.java:2804
 msgid "construction"
 msgstr "будується"
@@ -23220,5 +23257,5 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:571 build/trans_presets.java:2881
+#: build/trans_presets.java:571 build/trans_presets.java:2894
 msgid "intermediate"
 msgstr "середня"
@@ -23251,13 +23288,13 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1943
-#: build/trans_presets.java:1961 build/trans_presets.java:1977
-#: build/trans_presets.java:1994 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2046
-#: build/trans_presets.java:2068 build/trans_presets.java:2091
-#: build/trans_presets.java:2110 build/trans_presets.java:2127
-#: build/trans_presets.java:2146 build/trans_presets.java:2165
-#: build/trans_presets.java:2181 build/trans_presets.java:2198
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:581 build/trans_presets.java:1956
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007 build/trans_presets.java:2025
+#: build/trans_presets.java:2042 build/trans_presets.java:2059
+#: build/trans_presets.java:2081 build/trans_presets.java:2104
+#: build/trans_presets.java:2123 build/trans_presets.java:2140
+#: build/trans_presets.java:2159 build/trans_presets.java:2178
+#: build/trans_presets.java:2194 build/trans_presets.java:2211
+#: build/trans_presets.java:2226
 msgid "Wheelchairs"
 msgstr "Інвалідним візком"
@@ -23287,6 +23324,167 @@
 
 #. </optional>
+#. item "Ways/Cycle Lane"
+#: build/trans_presets.java:612
+msgid "Cycle Lane"
+msgstr "Вело-доріжка"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Bicycle" />
+#. item "Ways/Cycle Lane" label "Edit Cycle Lane"
+#: build/trans_presets.java:614
+msgid "Edit Cycle Lane"
+msgstr "Властивості вело-доріжки"
+
+#. item "Ways/Cycle Lane" combo "Cycleway"
+#: build/trans_presets.java:615
+msgid "Cycleway"
+msgstr "Вело-доріжка"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "lane"
+msgstr "смуга"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2895
+#: build/trans_presets.java:2902 build/trans_presets.java:2910
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2928 build/trans_presets.java:2934
+#: build/trans_presets.java:2940 build/trans_presets.java:2946
+#: build/trans_presets.java:2952 build/trans_presets.java:2958
+#: build/trans_presets.java:2982 build/trans_presets.java:2988
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3012
+#: build/trans_presets.java:3018 build/trans_presets.java:3024
+#: build/trans_presets.java:3030 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081
+msgid "track"
+msgstr "бігова доріжка"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_lane"
+msgstr "зворотня_смуга"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_track"
+msgstr "зворотній_трек"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite"
+msgstr "зворотній_напрямок"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "share_busway"
+msgstr "разом з автобусами"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "shared_lane"
+msgstr "спільна смуга"
+
+#. item "Ways/Cycle Lane" combo "Cycleway left"
+#: build/trans_presets.java:616
+msgid "Cycleway left"
+msgstr "Вело-доріжка ліворуч"
+
+#. item "Ways/Cycle Lane" combo "Cycleway right"
+#: build/trans_presets.java:617
+msgid "Cycleway right"
+msgstr "Вело-доріжка праворуч"
+
+#. item "Ways/Cycle Lane" check "Oneway (bicycle)"
+#: build/trans_presets.java:618
+msgid "Oneway (bicycle)"
+msgstr "Одностороння вело-доріжка"
+
+#. <space />
+#. item "Ways/Cycle Lane" label "Edit Highway"
+#: build/trans_presets.java:620
+msgid "Edit Highway"
+msgstr "Властивості дороги"
+
+#. item "Ways/Cycle Lane" combo "Highway"
+#: build/trans_presets.java:621
+msgid "Highway"
+msgstr "Дорога"
+
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:624
 msgid "Dedicated Cycleway"
 msgstr "Велодоріжка"
@@ -23304,11 +23502,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:616 build/trans_presets.java:638
-#: build/trans_presets.java:662
+#: build/trans_presets.java:628 build/trans_presets.java:650
+#: build/trans_presets.java:674
 msgid "Edit Cycleway"
 msgstr "Властивості Велодоріжки"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:628
+#: build/trans_presets.java:640
 msgid "Pedestrians"
 msgstr "Пішоходи"
@@ -23316,5 +23514,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:634
+#: build/trans_presets.java:646
 msgid "Segregated Foot- and Cycleway"
 msgstr "Розділені пішохідна і велодоріжка"
@@ -23322,5 +23520,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:670
 msgid "Combined Foot- and Cycleway"
 msgstr "Суміщені пішохідна і велодоріжка"
@@ -23328,5 +23526,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:683
+#: build/trans_presets.java:695
 msgid "Dedicated Footway"
 msgstr "Пішохідна доріжка"
@@ -23335,5 +23533,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:698
 msgid "Edit Footway"
 msgstr "Властивості Пішохідної доріжки"
@@ -23341,5 +23539,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:703
+#: build/trans_presets.java:715
 msgid "Steps"
 msgstr "Сходи"
@@ -23349,10 +23547,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:719
 msgid "Edit Flight of Steps"
 msgstr "Властивості Сходів"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:733
 msgid "Amount of Steps"
 msgstr "Кількість сходів"
@@ -23360,5 +23558,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:737
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -23366,5 +23564,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:726
+#: build/trans_presets.java:738
 msgid "Motorway Junction"
 msgstr "Магістральна розв’язка"
@@ -23372,10 +23570,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:728
+#: build/trans_presets.java:740
 msgid "Edit Motorway Junction"
 msgstr "Властивості Магістральної розв’язки"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:744
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -23384,10 +23582,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:745
 msgid "Exit to"
 msgstr "Виїзд/вихід на"
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:747
 msgid "Services"
 msgstr "Придорожні послуги"
@@ -23395,5 +23593,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:749
 msgid "Edit Service Station"
 msgstr "Властивості Придорожніх послуг"
@@ -23409,4 +23607,5 @@
 #. item "Car/Tyres" text "Operator"
 #. item "Car/Rental" text "Operator"
+#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Operator"
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
@@ -23486,42 +23685,42 @@
 #. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:742 build/trans_presets.java:915
-#: build/trans_presets.java:1600 build/trans_presets.java:1624
-#: build/trans_presets.java:1633 build/trans_presets.java:1642
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1673 build/trans_presets.java:1682
-#: build/trans_presets.java:1701 build/trans_presets.java:1840
-#: build/trans_presets.java:1937 build/trans_presets.java:1955
-#: build/trans_presets.java:2006 build/trans_presets.java:2023
-#: build/trans_presets.java:2082 build/trans_presets.java:2103
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2289 build/trans_presets.java:2299
-#: build/trans_presets.java:2360 build/trans_presets.java:2446
-#: build/trans_presets.java:2471 build/trans_presets.java:2514
-#: build/trans_presets.java:2547 build/trans_presets.java:2575
-#: build/trans_presets.java:2592 build/trans_presets.java:2600
-#: build/trans_presets.java:2612 build/trans_presets.java:2632
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2731 build/trans_presets.java:2953
-#: build/trans_presets.java:2962 build/trans_presets.java:3084
-#: build/trans_presets.java:3103 build/trans_presets.java:3122
-#: build/trans_presets.java:3140 build/trans_presets.java:3151
-#: build/trans_presets.java:3167 build/trans_presets.java:3223
-#: build/trans_presets.java:3270 build/trans_presets.java:3278
-#: build/trans_presets.java:3286 build/trans_presets.java:3311
-#: build/trans_presets.java:3426 build/trans_presets.java:3435
-#: build/trans_presets.java:3452 build/trans_presets.java:3461
-#: build/trans_presets.java:3498 build/trans_presets.java:3547
-#: build/trans_presets.java:3570 build/trans_presets.java:3579
-#: build/trans_presets.java:3601 build/trans_presets.java:3616
-#: build/trans_presets.java:3626 build/trans_presets.java:3635
-#: build/trans_presets.java:3663 build/trans_presets.java:3672
-#: build/trans_presets.java:3711 build/trans_presets.java:3727
-#: build/trans_presets.java:3736 build/trans_presets.java:3745
-#: build/trans_presets.java:3761 build/trans_presets.java:3783
-#: build/trans_presets.java:3798 build/trans_presets.java:3807
-#: build/trans_presets.java:4082 build/trans_presets.java:4175
-#: build/trans_presets.java:4324 build/trans_presets.java:4354
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:754 build/trans_presets.java:927
+#: build/trans_presets.java:1612 build/trans_presets.java:1636
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1714 build/trans_presets.java:1853
+#: build/trans_presets.java:1950 build/trans_presets.java:1968
+#: build/trans_presets.java:2019 build/trans_presets.java:2036
+#: build/trans_presets.java:2095 build/trans_presets.java:2116
+#: build/trans_presets.java:2152 build/trans_presets.java:2171
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
+#: build/trans_presets.java:2373 build/trans_presets.java:2459
+#: build/trans_presets.java:2484 build/trans_presets.java:2527
+#: build/trans_presets.java:2560 build/trans_presets.java:2588
+#: build/trans_presets.java:2605 build/trans_presets.java:2613
+#: build/trans_presets.java:2625 build/trans_presets.java:2645
+#: build/trans_presets.java:2654 build/trans_presets.java:2661
+#: build/trans_presets.java:2744 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:3097
+#: build/trans_presets.java:3116 build/trans_presets.java:3135
+#: build/trans_presets.java:3153 build/trans_presets.java:3164
+#: build/trans_presets.java:3180 build/trans_presets.java:3236
+#: build/trans_presets.java:3283 build/trans_presets.java:3291
+#: build/trans_presets.java:3299 build/trans_presets.java:3324
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3465 build/trans_presets.java:3474
+#: build/trans_presets.java:3511 build/trans_presets.java:3560
+#: build/trans_presets.java:3583 build/trans_presets.java:3592
+#: build/trans_presets.java:3614 build/trans_presets.java:3629
+#: build/trans_presets.java:3639 build/trans_presets.java:3648
+#: build/trans_presets.java:3676 build/trans_presets.java:3685
+#: build/trans_presets.java:3724 build/trans_presets.java:3740
+#: build/trans_presets.java:3749 build/trans_presets.java:3758
+#: build/trans_presets.java:3774 build/trans_presets.java:3796
+#: build/trans_presets.java:3811 build/trans_presets.java:3820
+#: build/trans_presets.java:4095 build/trans_presets.java:4188
+#: build/trans_presets.java:4337 build/trans_presets.java:4367
+#: build/trans_presets.java:4389
 msgid "Operator"
 msgstr "Оператор"
@@ -23530,6 +23729,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:743 build/trans_presets.java:753
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:755 build/trans_presets.java:765
+#: build/trans_presets.java:2641
 msgid "Toilets"
 msgstr "Туалет"
@@ -23537,5 +23736,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:746
+#: build/trans_presets.java:758
 msgid "Rest Area"
 msgstr "Зона відпочинку"
@@ -23543,5 +23742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:760
 msgid "Edit Rest Area"
 msgstr "Властивості Зони відпочинку"
@@ -23549,5 +23748,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:768
 msgid "Emergency Phone"
 msgstr "Телефон для екстрених викликів"
@@ -23557,5 +23756,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:773
 msgid "Traffic Signal"
 msgstr "Світлофор"
@@ -23565,5 +23764,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:765
+#: build/trans_presets.java:777
 msgid "Pedestrian crossing type"
 msgstr "Тип пішохідного переходу"
@@ -23572,6 +23771,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "uncontrolled"
 msgstr "нерегульований"
@@ -23580,6 +23779,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "traffic_signals"
 msgstr "регульований"
@@ -23588,6 +23787,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "island"
 msgstr "острів"
@@ -23596,6 +23795,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "unmarked"
 msgstr "непозначений"
@@ -23604,6 +23803,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:766 build/trans_presets.java:789
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:778 build/trans_presets.java:801
+#: build/trans_presets.java:1425
 msgid "Cross on horseback"
 msgstr "Дозволено переїзд верхи"
@@ -23612,6 +23811,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:788
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:779 build/trans_presets.java:800
+#: build/trans_presets.java:1426
 msgid "Cross by bicycle"
 msgstr "Дозволено переїзд велосипедом"
@@ -23620,11 +23819,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:768 build/trans_presets.java:790
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:1427
 msgid "Crossing attendant"
 msgstr "Під наглядом регулювальника"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:769
+#: build/trans_presets.java:781
 msgid "Crossing type name (UK)"
 msgstr "Тип перехода (В.Британія)"
@@ -23632,5 +23831,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "zebra"
 msgstr "zebra (нерегульований)"
@@ -23638,5 +23837,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pelican"
 msgstr "pelican (со світлофором)"
@@ -23644,5 +23843,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "toucan"
 msgstr "toucan (вело-пішохідний зі світлофором)"
@@ -23650,5 +23849,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "puffin"
 msgstr "puffin (зі світлофором з кнопкою)"
@@ -23656,5 +23855,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pegasus"
 msgstr "pegasus (для вершників)"
@@ -23662,5 +23861,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "tiger"
 msgstr "tiger (нерегульований вело-пішохідний)"
@@ -23668,5 +23867,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:784
 msgid "Stop"
 msgstr "Стоп"
@@ -23674,5 +23873,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:787
 msgid "Mini-roundabout"
 msgstr "Міні-круг"
@@ -23683,15 +23882,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "Direction"
 msgstr "Напрямок"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "clockwise"
 msgstr "за годинниковою стрілкою"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:794
 msgid "Pedestrian Crossing"
 msgstr "Пішохідний перехід"
@@ -23700,15 +23899,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:797
 msgid "Edit Crossing"
 msgstr "Властивості Пішохідного переходу"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:791
+#: build/trans_presets.java:803
 msgid "Type name (UK)"
 msgstr "Назва типи (В.Брит)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:805
 msgid "Traffic Calming"
 msgstr "Засоби для обмеження швидкості"
@@ -23716,40 +23915,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:807
 msgid "Edit Traffic Calming"
 msgstr "Властивості Засобів для обмеження швидкості"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "bump"
 msgstr "лежачий поліцейський"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "chicane"
 msgstr "шикана"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "choker"
 msgstr "звуження"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "cushion"
 msgstr "лежачий поліцейський з розривами"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "hump"
 msgstr "широкий лежачий поліцейський"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "table"
 msgstr "платформа"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:798
+#: build/trans_presets.java:810
 msgid "Passing Place"
 msgstr "Місце роз’їзду"
@@ -23757,5 +23956,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:812
 msgid "Edit Passing Place"
 msgstr "Властивості Місця роз’їзду"
@@ -23763,5 +23962,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:815
 msgid "Turning Circle"
 msgstr "Круг для розвороту"
@@ -23771,5 +23970,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:808
+#: build/trans_presets.java:820
 msgid "City Limit"
 msgstr "Знак «Межа міста»"
@@ -23777,15 +23976,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:822
 msgid "Edit City Limit Sign"
 msgstr "Властивості знаку «Межа міста»"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:827
 msgid "Second Name"
 msgstr "Друга назва"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:817
+#: build/trans_presets.java:829
 msgid "Speed Camera"
 msgstr "Камера (радар)"
@@ -23795,5 +23994,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:834
 msgid "Grit Bin"
 msgstr "Контейнер з піском (щебенем)"
@@ -23803,10 +24002,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr "Брід"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:828
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr "Властивості Броду"
@@ -23814,5 +24013,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -23820,5 +24019,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr "Властивості Перевалу"
@@ -23830,7 +24029,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:842 build/trans_presets.java:2024
-#: build/trans_presets.java:2273 build/trans_presets.java:3948
-#: build/trans_presets.java:3956 build/trans_presets.java:3964
+#: build/trans_presets.java:854 build/trans_presets.java:2037
+#: build/trans_presets.java:2286 build/trans_presets.java:3961
+#: build/trans_presets.java:3969 build/trans_presets.java:3977
 msgid "Elevation"
 msgstr "Висота над рівнем моря"
@@ -23865,18 +24064,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:843 build/trans_presets.java:1099
-#: build/trans_presets.java:1110 build/trans_presets.java:1124
-#: build/trans_presets.java:1139 build/trans_presets.java:1866
-#: build/trans_presets.java:2328 build/trans_presets.java:2399
-#: build/trans_presets.java:3326 build/trans_presets.java:3857
-#: build/trans_presets.java:3864 build/trans_presets.java:3871
-#: build/trans_presets.java:3878 build/trans_presets.java:3885
-#: build/trans_presets.java:3893 build/trans_presets.java:3901
-#: build/trans_presets.java:3909 build/trans_presets.java:3916
-#: build/trans_presets.java:3923 build/trans_presets.java:3930
-#: build/trans_presets.java:3939 build/trans_presets.java:3949
-#: build/trans_presets.java:3957 build/trans_presets.java:3965
-#: build/trans_presets.java:3972 build/trans_presets.java:3981
-#: build/trans_presets.java:3989 build/trans_presets.java:4254
+#: build/trans_presets.java:855 build/trans_presets.java:1111
+#: build/trans_presets.java:1122 build/trans_presets.java:1136
+#: build/trans_presets.java:1151 build/trans_presets.java:1879
+#: build/trans_presets.java:2341 build/trans_presets.java:2412
+#: build/trans_presets.java:3339 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3891 build/trans_presets.java:3898
+#: build/trans_presets.java:3906 build/trans_presets.java:3914
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3936 build/trans_presets.java:3943
+#: build/trans_presets.java:3952 build/trans_presets.java:3962
+#: build/trans_presets.java:3970 build/trans_presets.java:3978
+#: build/trans_presets.java:3985 build/trans_presets.java:3994
+#: build/trans_presets.java:4002 build/trans_presets.java:4267
 msgid "Wikipedia"
 msgstr "Вікіпедія"
@@ -23884,5 +24083,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:859
 msgid "Barriers"
 msgstr "Перепони"
@@ -23890,5 +24089,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:850
+#: build/trans_presets.java:862
 msgid "Bollard"
 msgstr "Стовпчик"
@@ -23896,5 +24095,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:864
 msgid "Edit Bollard"
 msgstr "Властивості Стовпчика"
@@ -23944,27 +24143,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:855 build/trans_presets.java:865
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:900 build/trans_presets.java:922
-#: build/trans_presets.java:965 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1014 build/trans_presets.java:1026
-#: build/trans_presets.java:1036 build/trans_presets.java:1045
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:867 build/trans_presets.java:877
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:912 build/trans_presets.java:934
+#: build/trans_presets.java:977 build/trans_presets.java:990
+#: build/trans_presets.java:1002 build/trans_presets.java:1014
+#: build/trans_presets.java:1026 build/trans_presets.java:1038
+#: build/trans_presets.java:1048 build/trans_presets.java:1057
+#: build/trans_presets.java:1066
 msgid "Allowed traffic:"
 msgstr "Дозволено пересування:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:874
 msgid "Cycle Barrier"
 msgstr "Перешкода для велосипедів"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:872
+#: build/trans_presets.java:884
 msgid "Block"
 msgstr "Блок"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:893
 msgid "Cattle Grid"
 msgstr "Перешкода для виходу худоби"
@@ -23972,10 +24171,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:895
 msgid "Edit Cattle Grid"
 msgstr "Властивості Перешкоди для виходу худоби з пасовища на дорогу"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:905
 msgid "Bus Trap"
 msgstr "Проїзд для автобусів"
@@ -23983,15 +24182,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:908
 msgid "Spikes"
 msgstr "Шипи"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:897
+#: build/trans_presets.java:909
 msgid "Edit Spikes"
 msgstr "Властивості Шипів"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:920
 msgid "Toll Booth"
 msgstr "Пункт сплати за проїзд"
@@ -23999,5 +24198,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:910
+#: build/trans_presets.java:922
 msgid "Edit Toll Booth"
 msgstr "Властивості Пункту сплати за проїзд"
@@ -24005,10 +24204,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:930
 msgid "Border Control"
 msgstr "Прикордонний контроль"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:931
 msgid "Edit Border Control"
 msgstr "Властивості Прикордонного контролю"
@@ -24017,5 +24216,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:945
 msgid "Hedge"
 msgstr "Жива огорожа"
@@ -24024,5 +24223,5 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:937
+#: build/trans_presets.java:949
 msgid "Fence"
 msgstr "Паркан"
@@ -24031,19 +24230,17 @@
 #. <key key="barrier" value="fence" />
 #. item "Barriers/Wire Fence"
-#: build/trans_presets.java:941
-#, fuzzy
+#: build/trans_presets.java:953
 msgid "Wire Fence"
-msgstr "паркан з дроту"
+msgstr "Огорожа з дроту"
 
 #. <key key="barrier" value="wire_fence" />
 #. item "Barriers/Wood Fence"
-#: build/trans_presets.java:944
-#, fuzzy
+#: build/trans_presets.java:956
 msgid "Wood Fence"
-msgstr "дерев’яний паркан"
+msgstr "Огорожа з деревини"
 
 #. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:959
 msgid "Wall"
 msgstr "Стіна"
@@ -24051,5 +24248,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:950
+#: build/trans_presets.java:962
 msgid "City Wall"
 msgstr "Міська стіна"
@@ -24058,5 +24255,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:966
 msgid "Retaining Wall"
 msgstr "Підпірна стінка"
@@ -24067,15 +24264,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:961
+#: build/trans_presets.java:973
 msgid "Entrance"
 msgstr "Вхід/В’їзд"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:974
 msgid "Edit Entrance"
 msgstr "Властивості Входу/В’їзду"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:985
 msgid "Gate"
 msgstr "Ворота"
@@ -24083,50 +24280,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:987
 msgid "Edit Gate"
 msgstr "Властивості Воріт"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:986
+#: build/trans_presets.java:998
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:987
+#: build/trans_presets.java:999
 msgid "Edit Lift Gate"
 msgstr "Властивості Шлагбаума"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1010
 msgid "Hampshire Gate"
 msgstr "Дротяні ворота"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1011
 msgid "Edit Hampshire Gate"
 msgstr "Властивості Дротяних воріт"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1022
 msgid "Bump Gate"
 msgstr "Ворота, що відкриваються бампером"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
 msgstr "Властивості Воріт, що відкриваються бампером"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1034
 msgid "Kissing Gate"
 msgstr "Вузька хвіртка"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
 msgstr "Властивості Вузької хвіртки"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1043
 msgid "Stile"
 msgstr "Перелаз"
@@ -24134,25 +24331,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1045
 msgid "Edit Stile"
 msgstr "Властивості Перелазу"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1053
 msgid "Turnstile"
 msgstr "Турнікет"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr "Властивості Турнікету"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1062
 msgid "Sally Port"
 msgstr "Подвійні ворота (шлюз)"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr "Властивості Подвійних воріт (шлюзу)"
@@ -24162,6 +24359,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1065 build/trans_presets.java:1066
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1077 build/trans_presets.java:1078
+#: build/trans_presets.java:1179
 msgid "Water"
 msgstr "Вода"
@@ -24169,5 +24366,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1080
 msgid "Drain"
 msgstr "Дренажний канал"
@@ -24175,10 +24372,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1082
 msgid "Edit Drain"
 msgstr "Властивості Дренажного каналу"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1088
 msgid "Ditch"
 msgstr "Канава"
@@ -24186,10 +24383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1090
 msgid "Edit Ditch"
 msgstr "Властивості Канави"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1084
+#: build/trans_presets.java:1096
 msgid "Stream"
 msgstr "Струмок"
@@ -24197,10 +24394,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1098
 msgid "Edit Stream"
 msgstr "Властивості Струмка"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1104
 msgid "Canal"
 msgstr "Канал"
@@ -24208,10 +24405,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1106
 msgid "Edit Canal"
 msgstr "Властивості Каналу"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1113
 msgid "River"
 msgstr "Ріка"
@@ -24221,5 +24418,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1105
+#: build/trans_presets.java:1117
 msgid "Edit River"
 msgstr "Властивості Ріки"
@@ -24227,5 +24424,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1125
 msgid "Spring"
 msgstr "Джерело"
@@ -24233,20 +24430,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1127
 msgid "Edit Spring"
 msgstr "Властивості Джерела"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1131
 msgid "Waterfall"
 msgstr "Водоспад"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1132
 msgid "Edit Waterfall"
 msgstr "Властивості Водоспаду"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1138
 msgid "Weir"
 msgstr "Водозлив"
@@ -24254,10 +24451,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1140
 msgid "Edit Weir"
 msgstr "Властивості Водозливу"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1145
 msgid "Dam"
 msgstr "Дамба"
@@ -24265,10 +24462,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1147
 msgid "Edit Dam"
 msgstr "Властивості Дамби"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1153
 msgid "Groyne"
 msgstr "Хвилелом"
@@ -24276,5 +24473,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1155
 msgid "Edit Groyne"
 msgstr "Властивості Хвилелому"
@@ -24284,15 +24481,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1160
 msgid "Basin"
 msgstr "Водойма"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr "Властивості Водойми"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
 msgid "Reservoir"
 msgstr "Водосховище"
@@ -24300,15 +24497,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1168
 msgid "Edit Reservoir Landuse"
 msgstr "Властивості Водосховища"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1173
 msgid "Covered Reservoir"
 msgstr "Критий резервуар"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr "Властивості Критого резервуара"
@@ -24316,20 +24513,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
 msgid "Edit Water"
 msgstr "Властивості Води"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1185
 msgid "Land"
 msgstr "Суходіл"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1186
 msgid "Edit Land"
 msgstr "Властивості Суходолу"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
 msgid "Coastline"
 msgstr "Узбережжя"
@@ -24337,10 +24534,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1192
 msgid "Edit Coastline"
 msgstr "Властивості Узбережжя"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1196
 msgid "Riverbank"
 msgstr "Берег ріки"
@@ -24349,5 +24546,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1199
 msgid "Edit Riverbank"
 msgstr "Властивості Берега ріки"
@@ -24355,5 +24552,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1204
 msgid "Wetland"
 msgstr "Заболочені землі"
@@ -24364,15 +24561,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1209
 msgid "Edit Wetland"
 msgstr "Властивості Заболочених земель"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "swamp"
 msgstr "болото"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "bog"
 msgstr "торф’яне болото"
@@ -24385,40 +24582,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1200 build/trans_style.java:2930
+#: build/trans_presets.java:1212 build/trans_style.java:2930
 msgid "marsh"
 msgstr "болото з відкритою водою"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "reedbed"
 msgstr "плавні"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "saltmarsh"
 msgstr "болото з солоною відкритою водою"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "tidalflat"
 msgstr "припливно-відливні ділянки"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "mangrove"
 msgstr "мангрові зарості"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
 msgid "Mud"
 msgstr "Грязі"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
 msgid "Edit Mud"
 msgstr "Властивості Грязі"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1219
 msgid "Beach"
 msgstr "Пляж"
@@ -24426,20 +24623,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1221
 msgid "Edit Beach"
 msgstr "Властивості Пляжу"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1225
 msgid "Bay"
 msgstr "Затока"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Edit Bay"
 msgstr "Властивості Затоки"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1230
 msgid "Cliff"
 msgstr "Скеля"
@@ -24447,15 +24644,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1232
 msgid "Edit Cliff"
 msgstr "Властивості Скелі"
 
 #. group "Shipping"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1237
 msgid "Shipping"
 msgstr "Судноплавство"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "Ferry Terminal"
 msgstr "Поромний причал"
@@ -24463,20 +24660,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1240
 msgid "Edit Ferry Terminal"
 msgstr "Властивості Поромного причалу"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "Cargo"
 msgstr "Для перевезення"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers"
 msgstr "пасажирів"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "vehicle"
 msgstr "автомобілі"
@@ -24562,6 +24759,6 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1231 build/trans_presets.java:4317
-#: build/trans_presets.java:4347 build/trans_style.java:189
+#: build/trans_presets.java:1243 build/trans_presets.java:4330
+#: build/trans_presets.java:4360 build/trans_style.java:189
 #: build/trans_style.java:525 build/trans_style.java:545
 #: build/trans_style.java:551 build/trans_style.java:570
@@ -24573,15 +24770,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "hgv"
 msgstr "вантажівки"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers;vehicle"
 msgstr "пасажири; автомобілі"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1245
 msgid "Ferry Route"
 msgstr "Поромна переправа"
@@ -24589,5 +24786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1247
 msgid "Edit Ferry"
 msgstr "Властивості Поромної переправи"
@@ -24596,15 +24793,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1244
+#: build/trans_presets.java:1256
 msgid "Edit Marina"
 msgstr "Властивості Пристані для яхт"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1260
 msgid "Pier"
 msgstr "Пірс"
@@ -24612,10 +24809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1262
 msgid "Edit Pier"
 msgstr "Властивості Пірсу"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1266
 msgid "Lock Gate"
 msgstr "Ворота шлюзу"
@@ -24624,5 +24821,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1270
 msgid "Turning Point"
 msgstr "Місце розвороту"
@@ -24632,5 +24829,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1275
 msgid "Slipway"
 msgstr "Сліп"
@@ -24640,10 +24837,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1279
 msgid "Edit Slipway"
 msgstr "Властивості Сліпу"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1283
 msgid "Boatyard"
 msgstr "Човнова станція"
@@ -24651,10 +24848,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1285
 msgid "Edit Boatyard"
 msgstr "Властивості Човнової станції"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1290
 msgid "Dock"
 msgstr "Док"
@@ -24662,20 +24859,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:1292
 msgid "Edit Dock"
 msgstr "Властивості Доку"
 
 #. group "Transport"
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1299
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1300
 msgid "Railway"
 msgstr "Залізниця"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1301
 msgid "Rail"
 msgstr "Рейки"
@@ -24683,5 +24880,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "Edit Rail"
 msgstr "Властивості Рейок"
@@ -24711,7 +24908,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1295 build/trans_presets.java:1307
-#: build/trans_presets.java:1331 build/trans_presets.java:1343
-#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1343 build/trans_presets.java:1355
+#: build/trans_presets.java:1367 build/trans_presets.java:1379
 msgid "Gauge (mm)"
 msgstr "Ширина колії (в мм)"
@@ -24727,8 +24924,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "Types"
 msgstr "Типи"
@@ -24742,8 +24939,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "yard"
 msgstr "депо"
@@ -24757,8 +24954,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "siding"
 msgstr "запасна колія"
@@ -24772,8 +24969,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "spur"
 msgstr "вітка"
@@ -24786,8 +24983,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "Electrified"
 msgstr "Електрифікація"
@@ -24800,8 +24997,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "contact_line"
 msgstr "контактний дріт"
@@ -24862,8 +25059,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_style.java:595
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -24885,9 +25082,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
-#: build/trans_presets.java:1346 build/trans_presets.java:1358
-#: build/trans_presets.java:1370 build/trans_presets.java:1625
-#: build/trans_presets.java:3314
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382 build/trans_presets.java:1637
+#: build/trans_presets.java:3327
 msgid "Voltage"
 msgstr "Напруга"
@@ -24900,8 +25097,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
@@ -24914,8 +25111,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "16.7"
 msgstr "16.7"
@@ -24923,10 +25120,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1314
 msgid "Narrow Gauge Rail"
 msgstr "Вузькоколійка"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1315
 msgid "Edit Narrow Gauge Rail"
 msgstr "Властивості Вузькоколійки"
@@ -24934,5 +25131,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1326
 msgid "Monorail"
 msgstr "Монорейка"
@@ -24940,5 +25137,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1328
 msgid "Edit Monorail"
 msgstr "Властивості Монорейки"
@@ -24946,10 +25143,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1338
 msgid "Preserved"
 msgstr "Законсервована"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr "Властивості Законсервованої колії"
@@ -24957,10 +25154,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1350
 msgid "Light Rail"
 msgstr "Наземне метро"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1351
 msgid "Edit Light Rail"
 msgstr "Властивості Наземного метро"
@@ -24968,10 +25165,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1362
 msgid "Subway"
 msgstr "Метрополітен"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1363
 msgid "Edit Subway"
 msgstr "Властивості Метрополітену"
@@ -24979,10 +25176,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1374
 msgid "Tram"
 msgstr "Трамвайна лінія"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1375
 msgid "Edit Tram"
 msgstr "Властивості Трамвайної лінії"
@@ -24990,5 +25187,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1386
 msgid "Bus Guideway"
 msgstr "Рейковий автобус"
@@ -24996,5 +25193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1388
 msgid "Edit Bus Guideway"
 msgstr "Властивості Рейкового автобуса"
@@ -25003,10 +25200,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1406
 msgid "Disused Rail"
 msgstr "Путі, що не використовуються"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1407
 msgid "Edit Disused Railway"
 msgstr "Властивості Путів, що не використовуються"
@@ -25015,10 +25212,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1410
 msgid "Optional Types"
 msgstr "Додаткові типи"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1412
 msgid "Abandoned Rail"
 msgstr "Занедбані колії"
@@ -25027,5 +25224,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1416
 msgid "Level Crossing"
 msgstr "Залізничний переїзд"
@@ -25034,5 +25231,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1420
 msgid "Crossing"
 msgstr "Перехід"
@@ -25042,5 +25239,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1424
 msgid "Crossing type"
 msgstr "Тип переходу"
@@ -25048,5 +25245,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1430
 msgid "Turntable"
 msgstr "Поворотна платформа"
@@ -25055,5 +25252,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1434
 msgid "Buffer Stop"
 msgstr "Буферний упор"
@@ -25062,10 +25259,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1439
 msgid "Aerialway"
 msgstr "Канатна дорога"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1440
 msgid "Chair Lift"
 msgstr "Крісельний підйомник"
@@ -25073,5 +25270,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1442
 msgid "Edit Chair Lift"
 msgstr "Властивості Крісельного підйомника"
@@ -25093,12 +25290,12 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1433 build/trans_presets.java:1447
-#: build/trans_presets.java:1458 build/trans_presets.java:1471
-#: build/trans_presets.java:1484 build/trans_presets.java:1498
-#: build/trans_presets.java:1509 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1542
-#: build/trans_presets.java:1552 build/trans_presets.java:1579
-#: build/trans_presets.java:2290 build/trans_presets.java:2300
-#: build/trans_presets.java:2633 build/trans_presets.java:3808
+#: build/trans_presets.java:1445 build/trans_presets.java:1459
+#: build/trans_presets.java:1470 build/trans_presets.java:1483
+#: build/trans_presets.java:1496 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1532
+#: build/trans_presets.java:1543 build/trans_presets.java:1554
+#: build/trans_presets.java:1564 build/trans_presets.java:1591
+#: build/trans_presets.java:2303 build/trans_presets.java:2313
+#: build/trans_presets.java:2646 build/trans_presets.java:3821
 msgid "Reference number"
 msgstr "Номер"
@@ -25124,18 +25321,16 @@
 #. <optional>
 #. item "Aerialway/Magic Carpet" text "Number of people per hour"
-#: build/trans_presets.java:1435 build/trans_presets.java:1449
-#: build/trans_presets.java:1460 build/trans_presets.java:1473
-#: build/trans_presets.java:1486 build/trans_presets.java:1500
-#: build/trans_presets.java:1511 build/trans_presets.java:1522
-#: build/trans_presets.java:1533 build/trans_presets.java:1544
-#, fuzzy
+#: build/trans_presets.java:1447 build/trans_presets.java:1461
+#: build/trans_presets.java:1472 build/trans_presets.java:1485
+#: build/trans_presets.java:1498 build/trans_presets.java:1512
+#: build/trans_presets.java:1523 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1556
 msgid "Number of people per hour"
-msgstr "Кількість місць"
+msgstr "Кількість людей на годину"
 
 #. item "Aerialway/Chair Lift" text "Number of people per chair"
-#: build/trans_presets.java:1436
-#, fuzzy
+#: build/trans_presets.java:1448
 msgid "Number of people per chair"
-msgstr "Кількість місць"
+msgstr "Кількість осіб на крісло"
 
 #. item "Aerialway/Chair Lift" text "Typical journey time in minutes"
@@ -25151,18 +25346,18 @@
 #. <optional>
 #. item "Aerialway/Goods" text "Typical journey time in minutes"
-#: build/trans_presets.java:1437 build/trans_presets.java:1450
-#: build/trans_presets.java:1462 build/trans_presets.java:1475
-#: build/trans_presets.java:1488 build/trans_presets.java:1501
-#: build/trans_presets.java:1512 build/trans_presets.java:1523
-#: build/trans_presets.java:1534 build/trans_presets.java:1545
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1449 build/trans_presets.java:1462
+#: build/trans_presets.java:1474 build/trans_presets.java:1487
+#: build/trans_presets.java:1500 build/trans_presets.java:1513
+#: build/trans_presets.java:1524 build/trans_presets.java:1535
+#: build/trans_presets.java:1546 build/trans_presets.java:1557
+#: build/trans_presets.java:1566
 msgid "Typical journey time in minutes"
-msgstr ""
+msgstr "Час подорожі у хвилинах"
 
 #. item "Aerialway/Chair Lift" check "Has bubble?"
 #. item "Aerialway/Mixed Lift" check "Has bubble?"
-#: build/trans_presets.java:1438 build/trans_presets.java:1489
+#: build/trans_presets.java:1450 build/trans_presets.java:1501
 msgid "Has bubble?"
-msgstr ""
+msgstr "Є навіс?"
 
 #. item "Aerialway/Chair Lift" check "Has heating?"
@@ -25170,13 +25365,12 @@
 #. item "Aerialway/Gondola" check "Has heating?"
 #. item "Aerialway/Mixed Lift" check "Has heating?"
-#: build/trans_presets.java:1439 build/trans_presets.java:1463
-#: build/trans_presets.java:1476 build/trans_presets.java:1490
-#, fuzzy
+#: build/trans_presets.java:1451 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1502
 msgid "Has heating?"
-msgstr "катання на ковзанах"
+msgstr "Є підігрів?"
 
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1454
 msgid "Drag Lift"
 msgstr "Бугельний підйомник"
@@ -25184,5 +25378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1456
 msgid "Edit Drag Lift"
 msgstr "Властивості Бугельного підйомника"
@@ -25190,5 +25384,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1465
 msgid "Cable Car"
 msgstr "Фунікулер"
@@ -25196,17 +25390,16 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1467
 msgid "Edit Cable Car"
 msgstr "Властивості Фунікулера"
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1461
-#, fuzzy
+#: build/trans_presets.java:1473
 msgid "Number of people per car"
-msgstr "Кількість місць"
+msgstr "Кількість осіб в автівці"
 
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1478
 msgid "Gondola"
 msgstr "З підвісними кабінами"
@@ -25214,103 +25407,93 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1480
 msgid "Edit Gondola"
 msgstr "Властивості Канатної дороги з підвісними кабінами"
 
 #. item "Aerialway/Gondola" text "Number of people per gondola"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1486
 msgid "Number of people per gondola"
-msgstr ""
+msgstr "Кількість осіб в гондолі"
 
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1479
-#, fuzzy
+#: build/trans_presets.java:1491
 msgid "Mixed Lift"
-msgstr "Крісельний підйомник"
+msgstr "Змішаний підйомник"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1493
 msgid "Edit Mixed Lift (containing both gondolas and chairs)"
-msgstr ""
+msgstr "Властивості змішаного підйомника (з гондолами та кріслами)"
 
 #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
-#: build/trans_presets.java:1487
+#: build/trans_presets.java:1499
 msgid "Number of people per gondola/chair"
-msgstr ""
+msgstr "Кількість осіб в гондолі/кріслі"
 
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1493
-#, fuzzy
+#: build/trans_presets.java:1505
 msgid "T-bar Lift"
-msgstr "Крісельний підйомник"
+msgstr "Т-образний підйомник"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
-#: build/trans_presets.java:1495
-#, fuzzy
+#: build/trans_presets.java:1507
 msgid "Edit T-bar Lift"
-msgstr "Властивості Крісельного підйомника"
+msgstr "Властивості Т-образного підйомника"
 
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1504
-#, fuzzy
+#: build/trans_presets.java:1516
 msgid "J-bar Lift"
-msgstr "Крісельний підйомник"
+msgstr "Г-образний підйомник"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
-#: build/trans_presets.java:1506
-#, fuzzy
+#: build/trans_presets.java:1518
 msgid "Edit J-bar Lift"
-msgstr "Властивості Крісельного підйомника"
+msgstr "Властивості Г-образного підйомника"
 
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1515
-#, fuzzy
+#: build/trans_presets.java:1527
 msgid "Platter Lift"
-msgstr "Крісельний підйомник"
+msgstr "Підйомник з дисковим сидінням"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Platter Lift" label "Edit Platter Lift"
-#: build/trans_presets.java:1517
-#, fuzzy
+#: build/trans_presets.java:1529
 msgid "Edit Platter Lift"
-msgstr "Властивості Крісельного підйомника"
+msgstr "Властивості підйомника з дисковим сидінням"
 
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1526
-#, fuzzy
+#: build/trans_presets.java:1538
 msgid "Rope Tow"
-msgstr "Опора ЛЕП"
+msgstr "Бугельний підйомник"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Rope Tow" label "Edit Rope Tow"
-#: build/trans_presets.java:1528
-#, fuzzy
+#: build/trans_presets.java:1540
 msgid "Edit Rope Tow"
-msgstr "Властивості Опори ЛЕП"
+msgstr "Властивості бугельного підйомника"
 
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1549
 msgid "Magic Carpet"
-msgstr ""
+msgstr "Транспортерна стрічка"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
-#: build/trans_presets.java:1539
-#, fuzzy
+#: build/trans_presets.java:1551
 msgid "Edit Magic Carpet"
-msgstr "Властивості Фунікулера"
+msgstr "Властивості транспортерної стрічки"
 
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Goods"
@@ -25318,5 +25501,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1561
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -25326,5 +25509,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1570
 msgctxt "aerialway"
 msgid "Station"
@@ -25333,5 +25516,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1572
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25339,5 +25522,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1576
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25346,5 +25529,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1578
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25362,6 +25545,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1573 build/trans_presets.java:1687
-#: build/trans_presets.java:1719 build/trans_surveyor.java:24
+#: build/trans_presets.java:1585 build/trans_presets.java:1700
+#: build/trans_presets.java:1732 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Стоянка"
@@ -25370,5 +25553,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1588
 msgid "Edit Parking"
 msgstr "Властивості Стоянки"
@@ -25376,5 +25559,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "multi-storey"
 msgstr "багаторівнева"
@@ -25382,5 +25565,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "surface"
 msgstr "наземна"
@@ -25388,10 +25571,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "underground"
 msgstr "підземна"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1593
 msgid "Park and Ride"
 msgstr "Перехоплююча стоянка"
@@ -25402,7 +25585,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1582 build/trans_presets.java:1693
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:1594 build/trans_presets.java:1706
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2647
 msgid "Fee"
 msgstr "Платна"
@@ -25410,25 +25593,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1596
 msgid "Capacity (overall)"
 msgstr "Місткість (загальна)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1597
 msgid "Spaces for Disabled"
 msgstr "Місця для інвалідів"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1598
 msgid "Spaces for Women"
 msgstr "Місця для жінок"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1599
 msgid "Spaces for Parents"
 msgstr "Місця для батьків"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1600
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Дивись в Wiki інші категорії місткості capacity:[types]=*."
@@ -25436,5 +25619,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1603
 msgid "Fuel"
 msgstr "Заправка"
@@ -25444,5 +25627,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1607
 msgid "Edit Fuel"
 msgstr "Властивості Заправки"
@@ -25454,120 +25637,118 @@
 #. item "Car/Tyres" text "Brand"
 #. item "Car/Rental" text "Brand"
-#. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1597 build/trans_presets.java:1632
-#: build/trans_presets.java:1648 build/trans_presets.java:1656
-#: build/trans_presets.java:1672 build/trans_presets.java:1681
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1609 build/trans_presets.java:1644
+#: build/trans_presets.java:1660 build/trans_presets.java:1668
+#: build/trans_presets.java:1684 build/trans_presets.java:1713
 msgid "Brand"
 msgstr "Торгова марка (Бренд)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Agip"
 msgstr "Agip"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Aral"
 msgstr "Aral"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Avia"
 msgstr "Avia"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "BP"
 msgstr "BP"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Chevron"
 msgstr "Шеврон"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Citgo"
 msgstr "Citgo"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Esso"
 msgstr "Esso"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Exxon"
 msgstr "Exxon"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Gulf"
 msgstr "Gulf"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Mobil"
 msgstr "Mobil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "OMV"
 msgstr "OMV"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Petro-Canada"
 msgstr "Petro-Canada"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Pioneer"
 msgstr "Pioneer"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Q8"
 msgstr "Q8"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Repsol"
 msgstr "Repsol"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Shell"
 msgstr "Shell"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Sunoco"
 msgstr "Sunoco"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Statoil"
 msgstr "Statoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Tamoil"
 msgstr "Tamoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Texaco"
 msgstr "Texaco"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Total"
 msgstr "Total"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Independent"
 msgstr "Незалежна"
@@ -25660,48 +25841,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2226
-#: build/trans_presets.java:2241 build/trans_presets.java:2327
-#: build/trans_presets.java:2338 build/trans_presets.java:2345
-#: build/trans_presets.java:2361 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2601 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2239
+#: build/trans_presets.java:2254 build/trans_presets.java:2340
+#: build/trans_presets.java:2351 build/trans_presets.java:2358
+#: build/trans_presets.java:2374 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2614 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "Opening Hours"
 msgstr "Години роботи"
@@ -25792,47 +25973,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2472 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2584
-#: build/trans_presets.java:2593 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2485 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2597
+#: build/trans_presets.java:2606 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "24/7"
 msgstr "Цілодобово"
@@ -25924,47 +26105,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2361
-#: build/trans_presets.java:2398 build/trans_presets.java:2414
-#: build/trans_presets.java:2438 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2624 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:3332
-#: build/trans_presets.java:3340 build/trans_presets.java:3389
-#: build/trans_presets.java:3396 build/trans_presets.java:3403
-#: build/trans_presets.java:3411 build/trans_presets.java:3418
-#: build/trans_presets.java:3427 build/trans_presets.java:3436
-#: build/trans_presets.java:3443 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3468
-#: build/trans_presets.java:3476 build/trans_presets.java:3482
-#: build/trans_presets.java:3490 build/trans_presets.java:3499
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3548 build/trans_presets.java:3556
-#: build/trans_presets.java:3562 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3586
-#: build/trans_presets.java:3592 build/trans_presets.java:3602
-#: build/trans_presets.java:3610 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3643
-#: build/trans_presets.java:3649 build/trans_presets.java:3655
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
-#: build/trans_presets.java:3681 build/trans_presets.java:3688
-#: build/trans_presets.java:3696 build/trans_presets.java:3703
-#: build/trans_presets.java:3712 build/trans_presets.java:3719
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3753
-#: build/trans_presets.java:3762 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3790 build/trans_presets.java:3799
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2374
+#: build/trans_presets.java:2411 build/trans_presets.java:2427
+#: build/trans_presets.java:2451 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2637 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:3345
+#: build/trans_presets.java:3353 build/trans_presets.java:3402
+#: build/trans_presets.java:3409 build/trans_presets.java:3416
+#: build/trans_presets.java:3424 build/trans_presets.java:3431
+#: build/trans_presets.java:3440 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3495
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3575 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3599
+#: build/trans_presets.java:3605 build/trans_presets.java:3615
+#: build/trans_presets.java:3623 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3656
+#: build/trans_presets.java:3662 build/trans_presets.java:3668
+#: build/trans_presets.java:3677 build/trans_presets.java:3686
+#: build/trans_presets.java:3694 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3725 build/trans_presets.java:3732
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3766
+#: build/trans_presets.java:3775 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3797
+#: build/trans_presets.java:3803 build/trans_presets.java:3812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
@@ -26034,126 +26215,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3443
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3719
-#: build/trans_presets.java:3753 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3790
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3456
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3732
+#: build/trans_presets.java:3766 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3803
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Вт-Нд 08:00-15:00;Сб 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "With shop"
 msgstr "Із крамницею"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "convenience"
 msgstr "супутні товари"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "kiosk"
 msgstr "кіоск"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1615
 msgid "Fuel types:"
 msgstr "Види палива:"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1616
 msgid "Diesel"
 msgstr "Дизельне"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1617
 msgid "Bio Diesel"
 msgstr "Біодизель"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1618
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Дизельне (зріджений газ — супер-дизель)"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Дизельне для вантажівок"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1620
 msgid "Octane 91"
 msgstr "бензин (91)"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1621
 msgid "Octane 95"
 msgstr "бензин (95)"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1622
 msgid "Octane 98"
 msgstr "бензин (98)"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1623
 msgid "Octane 100"
 msgstr "бензин (100)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1624
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% суміш етанолу)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1625
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% суміш етанолу)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1626
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1627
 msgid "CNG (Compressed Natural Gas)"
 msgstr "метан"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1628
 msgid "1/25 mix (mofa/moped)"
 msgstr "паливна суміш 1/25 (для мопедів)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1629
 msgid "1/50 mix (mofa/moped)"
 msgstr "паливна суміш 1/50 (для мопедів)"
@@ -26161,5 +26342,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1632
 msgid "Charging Station"
 msgstr "Зарядна станція"
@@ -26167,20 +26348,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1634
 msgid "Edit Charging Station (for electric cars)"
 msgstr "Властивості Зарядної станції (для електромобілів)"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1638
 msgid "Amperage"
 msgstr "Сила струму"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1640
 msgid "Wash"
 msgstr "Мийка"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "Властивості Мийки"
@@ -26188,5 +26369,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1649
 msgid "Car Dealer"
 msgstr "Автомобільний дилер"
@@ -26194,5 +26375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1651
 msgid "Edit Car Shop"
 msgstr "Властивості Автомобільного дилера"
@@ -26200,20 +26381,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1644 build/trans_presets.java:1706
+#: build/trans_presets.java:1656 build/trans_presets.java:1719
 msgid "Repair"
 msgstr "Автомайстерня"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1657
 msgid "Edit Car Repair"
 msgstr "Властивості Автомайстерні"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1664
 msgid "Tyres"
 msgstr "Колеса та Шини"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr "Властивості Магазину колес та шин"
@@ -26221,5 +26402,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1659 build/trans_presets.java:1711
+#: build/trans_presets.java:1671 build/trans_presets.java:1724
 msgid "Contact:"
 msgstr "Контакти:"
@@ -26263,15 +26444,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1660 build/trans_presets.java:1712
-#: build/trans_presets.java:1945 build/trans_presets.java:1963
-#: build/trans_presets.java:1979 build/trans_presets.java:1996
-#: build/trans_presets.java:2014 build/trans_presets.java:2031
-#: build/trans_presets.java:2053 build/trans_presets.java:2070
-#: build/trans_presets.java:2093 build/trans_presets.java:2112
-#: build/trans_presets.java:2129 build/trans_presets.java:2148
-#: build/trans_presets.java:2167 build/trans_presets.java:2183
-#: build/trans_presets.java:2200 build/trans_presets.java:2215
-#: build/trans_presets.java:2448 build/trans_presets.java:2613
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:1672 build/trans_presets.java:1725
+#: build/trans_presets.java:1958 build/trans_presets.java:1976
+#: build/trans_presets.java:1992 build/trans_presets.java:2009
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2066 build/trans_presets.java:2083
+#: build/trans_presets.java:2106 build/trans_presets.java:2125
+#: build/trans_presets.java:2142 build/trans_presets.java:2161
+#: build/trans_presets.java:2180 build/trans_presets.java:2196
+#: build/trans_presets.java:2213 build/trans_presets.java:2228
+#: build/trans_presets.java:2461 build/trans_presets.java:2626
+#: build/trans_presets.java:4261
 msgid "Phone Number"
 msgstr "Номер телефону"
@@ -26296,18 +26477,19 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1661 build/trans_presets.java:1713
-#: build/trans_presets.java:1946 build/trans_presets.java:1964
-#: build/trans_presets.java:1980 build/trans_presets.java:1997
-#: build/trans_presets.java:2015 build/trans_presets.java:2032
-#: build/trans_presets.java:2054 build/trans_presets.java:2071
-#: build/trans_presets.java:2094 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2149
-#: build/trans_presets.java:2168 build/trans_presets.java:2184
-#: build/trans_presets.java:2201 build/trans_presets.java:2216
-#: build/trans_presets.java:4249
+#: build/trans_presets.java:1673 build/trans_presets.java:1726
+#: build/trans_presets.java:1959 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2028 build/trans_presets.java:2045
+#: build/trans_presets.java:2067 build/trans_presets.java:2084
+#: build/trans_presets.java:2107 build/trans_presets.java:2126
+#: build/trans_presets.java:2143 build/trans_presets.java:2162
+#: build/trans_presets.java:2181 build/trans_presets.java:2197
+#: build/trans_presets.java:2214 build/trans_presets.java:2229
+#: build/trans_presets.java:4262
 msgid "Fax Number"
 msgstr "Номер факсу"
 
 #. item "Car/Tyres" text "Website"
+#. item "Car/Sharing" text "Website"
 #. item "Motorcycle/Motorcycle Dealer" text "Website"
 #. item "Facilities/Accommodation/Hotel" text "Website"
@@ -26330,14 +26512,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1662 build/trans_presets.java:1714
-#: build/trans_presets.java:1947 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1998
-#: build/trans_presets.java:2016 build/trans_presets.java:2033
-#: build/trans_presets.java:2055 build/trans_presets.java:2072
-#: build/trans_presets.java:2095 build/trans_presets.java:2114
-#: build/trans_presets.java:2131 build/trans_presets.java:2150
-#: build/trans_presets.java:2169 build/trans_presets.java:2185
-#: build/trans_presets.java:2202 build/trans_presets.java:2217
-#: build/trans_presets.java:2449 build/trans_presets.java:4251
+#: build/trans_presets.java:1674 build/trans_presets.java:1696
+#: build/trans_presets.java:1727 build/trans_presets.java:1960
+#: build/trans_presets.java:1978 build/trans_presets.java:1994
+#: build/trans_presets.java:2011 build/trans_presets.java:2029
+#: build/trans_presets.java:2046 build/trans_presets.java:2068
+#: build/trans_presets.java:2085 build/trans_presets.java:2108
+#: build/trans_presets.java:2127 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2182
+#: build/trans_presets.java:2198 build/trans_presets.java:2215
+#: build/trans_presets.java:2230 build/trans_presets.java:2462
+#: build/trans_presets.java:4264
 msgid "Website"
 msgstr "Веб-сайт"
@@ -26362,14 +26545,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1663 build/trans_presets.java:1715
-#: build/trans_presets.java:1948 build/trans_presets.java:1966
-#: build/trans_presets.java:1982 build/trans_presets.java:1999
-#: build/trans_presets.java:2017 build/trans_presets.java:2034
-#: build/trans_presets.java:2056 build/trans_presets.java:2073
-#: build/trans_presets.java:2096 build/trans_presets.java:2115
-#: build/trans_presets.java:2132 build/trans_presets.java:2151
-#: build/trans_presets.java:2170 build/trans_presets.java:2186
-#: build/trans_presets.java:2203 build/trans_presets.java:2218
-#: build/trans_presets.java:4252
+#: build/trans_presets.java:1675 build/trans_presets.java:1728
+#: build/trans_presets.java:1961 build/trans_presets.java:1979
+#: build/trans_presets.java:1995 build/trans_presets.java:2012
+#: build/trans_presets.java:2030 build/trans_presets.java:2047
+#: build/trans_presets.java:2069 build/trans_presets.java:2086
+#: build/trans_presets.java:2109 build/trans_presets.java:2128
+#: build/trans_presets.java:2145 build/trans_presets.java:2164
+#: build/trans_presets.java:2183 build/trans_presets.java:2199
+#: build/trans_presets.java:2216 build/trans_presets.java:2231
+#: build/trans_presets.java:4265
 msgid "Email Address"
 msgstr "Адреса ел. пошти"
@@ -26379,6 +26562,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1666 build/trans_presets.java:1705
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1678 build/trans_presets.java:1718
+#: build/trans_presets.java:1753
 msgid "Rental"
 msgstr "Прокат"
@@ -26387,10 +26570,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1681
 msgid "Edit Car Rental"
 msgstr "Властивості Прокату автомобілів"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1688
 msgid "Sharing"
 msgstr "Спільне користування"
@@ -26398,21 +26581,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1690
 msgid "Edit Car Sharing"
 msgstr "Властивості Спільного користування"
 
+#. item "Car/Sharing" text "Capacity"
+#. item "Motorcycle/Parking" text "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1693 build/trans_presets.java:1704
+#: build/trans_presets.java:1737
+msgid "Capacity"
+msgstr "Місткість"
+
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1701
 msgid "Edit Motorcycle Parking"
 msgstr "Властивості Стоянки для мотоциклів"
 
-#. item "Motorcycle/Parking" text "Capacity"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1691 build/trans_presets.java:1724
-msgid "Capacity"
-msgstr "Місткість"
-
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1708
 msgid "Motorcycle Dealer"
 msgstr "Мотомагазин"
@@ -26420,25 +26605,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1710
 msgid "Edit Shop Motorcycle"
 msgstr "Властивості мотомагазину"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1713
 msgid "independent"
 msgstr "незалежний"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1716
 msgid "Services:"
 msgstr "Підрозділи:"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgid "Sale"
 msgstr "Продаж"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "yes"
@@ -26446,5 +26631,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "brand"
@@ -26452,5 +26637,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "used"
@@ -26458,5 +26643,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "no"
@@ -26467,6 +26652,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
 msgid "brand"
 msgstr "певної марки"
@@ -26474,35 +26659,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1706 build/trans_presets.java:1708
+#: build/trans_presets.java:1719 build/trans_presets.java:1721
 msgid "oldtimer"
 msgstr "ретро"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "Safety inspection"
 msgstr "Перевірка безпеки"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "DEKRA"
 msgstr "DEKRA"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "GTÜ"
 msgstr "GTÜ"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "MOT"
 msgstr "MOT"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "TÜV"
 msgstr "TÜV"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1721
 msgid "Parts"
 msgstr "Запчастини"
@@ -26512,6 +26697,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2678
-#: build/trans_presets.java:3485 build/trans_presets.java:3486
+#: build/trans_presets.java:1722 build/trans_presets.java:2691
+#: build/trans_presets.java:3498 build/trans_presets.java:3499
 msgid "Clothes"
 msgstr "Одяг/Дрантя"
@@ -26519,10 +26704,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1734
 msgid "Edit Bicycle Parking"
 msgstr "Властивості Велостоянки"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1739
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -26531,40 +26716,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1742
 msgid "Edit Bicycle Shop"
 msgstr "Властивості Веломагазина"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1745
 msgid "Bicycles are sold"
 msgstr "Продаж велосипедів"
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1746
 msgid "Second-hand bicycles are sold"
 msgstr "Продаж б/в велосипедів"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1747
 msgid "Bicycles are repaired"
 msgstr "Ремонт велосипедів"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1748
 msgid "Bicycles are rented"
 msgstr "Прокат велосипедів"
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1749
 msgid "Free bicycle pump"
 msgstr "Безкоштовний велосипедний насос"
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1750
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr "Інструменти для ремонту власними силами"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1751
 msgid "Bicycles are washed (for a fee)"
 msgstr "Мийка для велосипедів (платна)"
@@ -26573,10 +26758,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1756
 msgid "Edit Bicycle Rental"
 msgstr "Властивості Велопрокату"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1761
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -26584,5 +26769,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1762
 msgctxt "railway"
 msgid "Station"
@@ -26592,5 +26777,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1765
 msgctxt "railway"
 msgid "Edit Station"
@@ -26598,5 +26783,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1770
 msgid "UIC-Reference"
 msgstr "код UIC"
@@ -26604,5 +26789,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1773
 msgid "Railway Halt"
 msgstr "Залізнична зупинка"
@@ -26610,5 +26795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1775
 msgid "Edit Halt"
 msgstr "Властивості Залізничної зупинки"
@@ -26616,5 +26801,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1782
 msgid "Tram Stop"
 msgstr "Трамвайна зупинка"
@@ -26623,5 +26808,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1785
 msgid "Edit Tram Stop"
 msgstr "Властивості Трамвайної зупинки"
@@ -26629,5 +26814,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1792
 msgid "Railway Platform"
 msgstr "Залізнична платформа"
@@ -26636,5 +26821,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1795
 msgid "Edit Railway Platform"
 msgstr "Властивості Залізничної платформи"
@@ -26646,5 +26831,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1785 build/trans_presets.java:1830
+#: build/trans_presets.java:1798 build/trans_presets.java:1843
 msgid "Reference (track number)"
 msgstr "Номер платформи (путі)"
@@ -26653,11 +26838,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1787 build/trans_presets.java:1832
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:1800 build/trans_presets.java:1845
+#: build/trans_presets.java:2349
 msgid "Area"
 msgstr "Ділянка"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1802
 msgid "Subway Entrance"
 msgstr "Вхід в метро"
@@ -26666,5 +26851,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1805
 msgid "Edit Subway Entrance"
 msgstr "Властивості Входу в метро"
@@ -26672,5 +26857,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1797 build/trans_presets.java:2635
+#: build/trans_presets.java:1810 build/trans_presets.java:2648
 msgid "Wheelchair"
 msgstr "В інвалідних візках"
@@ -26679,5 +26864,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1815
 msgid "Bus Station"
 msgstr "Автобусна станція"
@@ -26686,5 +26871,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1818
 msgid "Edit Bus Station"
 msgstr "Свойства автобусной станции"
@@ -26692,5 +26877,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1824
 msgid "Bus Stop"
 msgstr "Автобусна зупинка"
@@ -26700,5 +26885,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1828
 msgid "Edit Bus Stop"
 msgstr "Властивості Автобусної зупинки"
@@ -26707,6 +26892,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1820 build/trans_presets.java:2698
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:1833 build/trans_presets.java:2711
+#: build/trans_presets.java:2722
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -26718,10 +26903,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1821 build/trans_presets.java:2690
+#: build/trans_presets.java:1834 build/trans_presets.java:2703
 msgid "Bench"
 msgstr "Лавка"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1835
 msgid "Tactile Paving"
 msgstr "Тактильне мощення"
@@ -26729,10 +26914,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1839
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1840
 msgid "Edit Bus Platform"
 msgstr "Властивості Автобусної платформи"
@@ -26740,10 +26925,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1848
 msgid "Ticket Machine"
 msgstr "Автомат продажу квитків"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1854
 msgid "Reference Number"
 msgstr "Номер"
@@ -26752,6 +26937,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1842 build/trans_presets.java:2649
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:1855 build/trans_presets.java:2662
+#: build/trans_presets.java:3823
 msgid "Coins"
 msgstr "Монети"
@@ -26760,6 +26945,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1843 build/trans_presets.java:2650
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:1856 build/trans_presets.java:2663
+#: build/trans_presets.java:3824
 msgid "Notes"
 msgstr "Банкноти"
@@ -26768,6 +26953,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1844 build/trans_presets.java:2651
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1857 build/trans_presets.java:2664
+#: build/trans_presets.java:3825
 msgid "Electronic purses and Charge cards"
 msgstr "Електронні гаманці та платіжні картки"
@@ -26776,6 +26961,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1845 build/trans_presets.java:2652
-#: build/trans_presets.java:3813
+#: build/trans_presets.java:1858 build/trans_presets.java:2665
+#: build/trans_presets.java:3826
 msgid "Debit cards"
 msgstr "Дебетові картки"
@@ -26784,6 +26969,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1846 build/trans_presets.java:2653
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:1859 build/trans_presets.java:2666
+#: build/trans_presets.java:3827
 msgid "Credit cards"
 msgstr "Кредитні картки"
@@ -26791,10 +26976,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1847 build/trans_presets.java:3815
+#: build/trans_presets.java:1860 build/trans_presets.java:3828
 msgid "Account or loyalty cards"
 msgstr "накопичувальні, дисконтні карти"
 
 #. item "Taxi"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1863
 msgid "Taxi"
 msgstr "Таксі"
@@ -26802,5 +26987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1865
 msgid "Edit Taxi station"
 msgstr "Властивості Стоянки таксі"
@@ -26808,10 +26993,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1870
 msgid "Airport"
 msgstr "Аеропорт"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1871
 msgid "Airport Ground"
 msgstr "Територія аеропорту"
@@ -26819,5 +27004,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1873
 msgid "Edit Airport Ground"
 msgstr "Властивості Території аеропорту"
@@ -26825,10 +27010,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1877
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1878
 msgid "ICAO"
 msgstr "ICAO"
@@ -26837,5 +27022,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1883
 msgid "Runway"
 msgstr "Злітно-посадкова смуга"
@@ -26843,5 +27028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1885
 msgid "Edit Runway"
 msgstr "Властивості Злітно-посадкової смуги"
@@ -26849,5 +27034,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1891
 msgid "Taxiway"
 msgstr "Руліжна доріжка"
@@ -26855,5 +27040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1893
 msgid "Edit Taxiway"
 msgstr "Властивості Руліжної доріжки"
@@ -26861,5 +27046,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1899
 msgid "Helipad"
 msgstr "Вертолітний майданчик"
@@ -26867,5 +27052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1901
 msgid "Edit Helipad"
 msgstr "Властивості Вертолітного майданчику"
@@ -26875,5 +27060,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1894 build/trans_presets.java:1896
+#: build/trans_presets.java:1907 build/trans_presets.java:1909
 msgid "Apron"
 msgstr "Перон"
@@ -26883,5 +27068,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1899 build/trans_presets.java:1901
+#: build/trans_presets.java:1912 build/trans_presets.java:1914
 msgid "Hangar"
 msgstr "Ангар"
@@ -26892,6 +27077,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1904 build/trans_presets.java:1906
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:1917 build/trans_presets.java:1919
+#: build/trans_presets.java:3217
 msgid "Beacon"
 msgstr "Сигнальний вогонь"
@@ -26901,5 +27086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1909 build/trans_presets.java:1911
+#: build/trans_presets.java:1922 build/trans_presets.java:1924
 msgid "Windsock"
 msgstr "Вітровказівник (флюгер)"
@@ -26908,5 +27093,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1928
 msgid "Terminal"
 msgstr "Термінал"
@@ -26914,10 +27099,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1930
 msgid "Edit Terminal"
 msgstr "Властивості Терміналу"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1934
 msgctxt "airport"
 msgid "Gate"
@@ -26926,15 +27111,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1936
 msgid "Edit Terminal Gate"
 msgstr "Властивості Виходу на посадку"
 
 #. group "Facilities"
-#: build/trans_presets.java:1929 build/trans_presets.java:2627
+#: build/trans_presets.java:1942 build/trans_presets.java:2640
 msgid "Facilities"
 msgstr "Послуги"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1943
 msgid "Accommodation"
 msgstr "Житло"
@@ -26946,5 +27131,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1931 build/trans_surveyor.java:43
+#: build/trans_presets.java:1944 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Готель"
@@ -26953,5 +27138,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1947
 msgid "Edit Hotel"
 msgstr "Властивості Готелю"
@@ -26965,8 +27150,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1938 build/trans_presets.java:1956
-#: build/trans_presets.java:1972 build/trans_presets.java:1989
-#: build/trans_presets.java:2007 build/trans_presets.java:2041
-#: build/trans_presets.java:2063 build/trans_presets.java:2086
+#: build/trans_presets.java:1951 build/trans_presets.java:1969
+#: build/trans_presets.java:1985 build/trans_presets.java:2002
+#: build/trans_presets.java:2020 build/trans_presets.java:2054
+#: build/trans_presets.java:2076 build/trans_presets.java:2099
 msgid "Stars"
 msgstr "Зірки"
@@ -27002,12 +27187,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "Internet access"
 msgstr "Інтернет доступ"
@@ -27028,12 +27213,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wlan"
 msgstr "бездротовий"
@@ -27054,12 +27239,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wired"
 msgstr "по проводах"
@@ -27086,12 +27271,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195 build/trans_style.java:1069
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208 build/trans_style.java:1069
 msgid "terminal"
 msgstr "термінал"
@@ -27112,12 +27297,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1941 build/trans_presets.java:1959
-#: build/trans_presets.java:1975 build/trans_presets.java:1992
-#: build/trans_presets.java:2010 build/trans_presets.java:2027
-#: build/trans_presets.java:2044 build/trans_presets.java:2066
-#: build/trans_presets.java:2089 build/trans_presets.java:2108
-#: build/trans_presets.java:2125 build/trans_presets.java:2144
-#: build/trans_presets.java:2163 build/trans_presets.java:2179
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "Internet access fee"
 msgstr "Плата за інтернет доступ"
@@ -27140,12 +27325,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "Smoking"
 msgstr "Місця для паління"
@@ -27167,12 +27352,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "dedicated"
 msgstr "тільки для курців"
@@ -27194,12 +27379,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "separated"
 msgstr "роздільно"
@@ -27221,17 +27406,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "isolated"
 msgstr "ізольовано"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1963
 msgid "Motel"
 msgstr "Мотель"
@@ -27239,20 +27424,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1965
 msgid "Edit Motel"
 msgstr "Властивості Мотелю"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1981
 msgid "Guest House"
 msgstr "Гостьовий будинок"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1982
 msgid "Edit Guest House"
 msgstr "Властивості Гостьового будинку"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1997
 msgid "Chalet"
 msgstr "Дача/Шале"
@@ -27260,10 +27445,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1999
 msgid "Edit Chalet"
 msgstr "Властивості Дачі/Шале"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2014
 msgid "Hostel"
 msgstr "Хостел/Туристичний табір"
@@ -27271,15 +27456,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2016
 msgid "Edit Hostel"
 msgstr "Праивти хостел/туристичний табір"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2032
 msgid "Alpine Hut"
 msgstr "Гірський притулок"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2033
 msgid "Edit Alpine Hut"
 msgstr "Властивості Гірського притулку"
@@ -27287,10 +27472,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2050
 msgid "Caravan Site"
 msgstr "Стоянка фургонів"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2051
 msgid "Edit Caravan Site"
 msgstr "Властивості Стоянки фургонів"
@@ -27298,30 +27483,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2061
 msgid "Number of places"
 msgstr "Кількість місць"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "Requires a fee"
 msgstr "Потребує оплати"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "interval"
 msgstr "інтервал"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2063
 msgid "Power supply"
 msgstr "Наявність електрики"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2064
 msgid "Tents allowed"
 msgstr "Дозволяються намети"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2071
 msgid "Camping Site"
 msgstr "Кемпінг"
@@ -27329,10 +27514,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2073
 msgid "Edit Camping Site"
 msgstr "Властивості Кемпінгу"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2089
 msgid "Food+Drinks"
 msgstr "Харчування"
@@ -27343,5 +27528,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2077 build/trans_surveyor.java:47
+#: build/trans_presets.java:2090 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -27349,5 +27534,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2092
 msgid "Edit Restaurant"
 msgstr "Властивості Ресторану"
@@ -27356,6 +27541,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2153
 msgid "Cuisine"
 msgstr "Кухня"
@@ -27363,5 +27548,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "italian"
 msgstr "італійська"
@@ -27369,5 +27554,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "chinese"
 msgstr "китайська"
@@ -27375,5 +27560,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "pizza"
 msgstr "піца"
@@ -27381,5 +27566,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "burger"
 msgstr "бутерброди"
@@ -27387,5 +27572,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "greek"
 msgstr "грецька"
@@ -27393,5 +27578,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "german"
 msgstr "німецька"
@@ -27399,5 +27584,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "indian"
 msgstr "індійська"
@@ -27405,5 +27590,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "regional"
 msgstr "місцева"
@@ -27411,5 +27596,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "kebab"
 msgstr "кебаб/шашлик"
@@ -27417,5 +27602,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "turkish"
 msgstr "турецька"
@@ -27423,5 +27608,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "asian"
 msgstr "азійська"
@@ -27429,5 +27614,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "thai"
 msgstr "тайська"
@@ -27435,5 +27620,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "mexican"
 msgstr "мексиканська"
@@ -27441,5 +27626,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "japanese"
 msgstr "японська"
@@ -27447,5 +27632,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "french"
 msgstr "французька"
@@ -27453,5 +27638,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sandwich"
 msgstr "сандвічі"
@@ -27459,5 +27644,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sushi"
 msgstr "суші"
@@ -27465,10 +27650,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2084 build/trans_presets.java:2159
+#: build/trans_presets.java:2097 build/trans_presets.java:2172
 msgid "Microbrewery"
 msgstr "Міні-пивоварня"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2111
 msgid "Fast Food"
 msgstr "Швидке харчування"
@@ -27476,20 +27661,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2113
 msgid "Edit Fast Food Restaurant"
 msgstr "Властивості Пунктів швидкого харчування"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "fish_and_chips"
 msgstr "риба і чіпси"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "chicken"
 msgstr "курятина"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2130
 msgid "Food Court"
 msgstr "Відкритий майданчик (кафе)"
@@ -27497,10 +27682,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2132
 msgid "Edit Food Court"
 msgstr "Властивості Відкритого майданчику (кафе)"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2147
 msgid "Cafe"
 msgstr "Кафе"
@@ -27508,15 +27693,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2149
 msgid "Edit Cafe"
 msgstr "Властивості Кафе"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2153
 msgid "ice_cream"
 msgstr "морозиво"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2166
 msgid "Pub"
 msgstr "Шинок"
@@ -27524,20 +27709,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2168
 msgid "Edit Pub"
 msgstr "Властивості Шинка"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2185
 msgid "Biergarten"
 msgstr "Пивний сад"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2186
 msgid "Edit Biergarten"
 msgstr "Властивості Пивного саду"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2201
 msgid "Bar"
 msgstr "Бар"
@@ -27545,10 +27730,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2203
 msgid "Edit Bar"
 msgstr "Властивості Бару"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2218
 msgid "Nightclub"
 msgstr "Нічний клуб"
@@ -27556,25 +27741,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2220
 msgid "Edit Nightclub"
 msgstr "Властивості Нічного клубу"
 
 #. group "Tourism"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2234
 msgid "Tourism"
 msgstr "Туризм"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2235
 msgid "Attraction"
 msgstr "Атракціони"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2236
 msgid "Edit Attraction"
 msgstr "Властивості Атракціонів"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2241
 msgid "Viewpoint"
 msgstr "Оглядовий майданчик"
@@ -27582,10 +27767,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2243
 msgid "Edit Viewpoint"
 msgstr "Властивості Оглядового майданчику"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2246
 msgid "Look-Out Tower"
 msgstr "Оглядова вежа"
@@ -27593,20 +27778,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2249
 msgid "Information Office"
 msgstr "Інформаційне бюро"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2256
 msgid "Map"
 msgstr "Мапа"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "Detail Grade"
 msgstr "Тип мапи"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "topo"
 msgstr "топографічна"
@@ -27639,5 +27824,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2248 build/trans_presets.java:4388
+#: build/trans_presets.java:2261 build/trans_presets.java:4401
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -27646,25 +27831,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "scheme"
 msgstr "план-схема"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "Shown Area"
 msgstr "Територія"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "site"
 msgstr "місцевість"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "city"
 msgstr "місто"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "region"
 msgstr "область"
@@ -27673,6 +27858,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2250 build/trans_presets.java:2266
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2263 build/trans_presets.java:2279
+#: build/trans_presets.java:2323
 msgid "Closer Description"
 msgstr "Детальний опис"
@@ -27682,5 +27867,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2252 build/trans_presets.java:2275
+#: build/trans_presets.java:2265 build/trans_presets.java:2288
 msgid "Routes shown for:"
 msgstr "Маршрути на мапі:"
@@ -27688,5 +27873,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2253 build/trans_presets.java:2276
+#: build/trans_presets.java:2266 build/trans_presets.java:2289
 msgid "Hiking"
 msgstr "піші"
@@ -27695,6 +27880,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2254 build/trans_presets.java:2277
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2267 build/trans_presets.java:2290
+#: build/trans_presets.java:2840
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -27702,5 +27887,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2255 build/trans_presets.java:2278
+#: build/trans_presets.java:2268 build/trans_presets.java:2291
 msgid "Mountainbiking"
 msgstr "для гірського велосипеду"
@@ -27709,6 +27894,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2256 build/trans_presets.java:2279
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2269 build/trans_presets.java:2292
+#: build/trans_presets.java:2888
 msgid "Skiing"
 msgstr "Лижі"
@@ -27716,5 +27901,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2257 build/trans_presets.java:2280
+#: build/trans_presets.java:2270 build/trans_presets.java:2293
 msgid "Riding"
 msgstr "кінні"
@@ -27722,50 +27907,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2258 build/trans_presets.java:2281
+#: build/trans_presets.java:2271 build/trans_presets.java:2294
 msgid "... other transportation modes possible"
 msgstr "…інші можливі способи пересування"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2273
 msgid "Information Board"
 msgstr "Інформаційна дошка"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "Board Content"
 msgstr "Вміст покажчика"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "notice"
 msgstr "повідомлення"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "history"
 msgstr "історична довідка"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "nature"
 msgstr "природа"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "wildlife"
 msgstr "жива природа"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "plants"
 msgstr "рослини"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2281
 msgid "Guidepost"
 msgstr "Вказівний стовп"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2296
 msgid "Information Terminal"
 msgstr "Інформаційний термінал"
@@ -27773,10 +27958,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2288 build/trans_presets.java:2298
+#: build/trans_presets.java:2301 build/trans_presets.java:2311
 msgid "Closer description"
 msgstr "Детальний опис"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2306
 msgid "Audioguide"
 msgstr "Аудіогід"
@@ -27784,25 +27969,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2316
 msgid "Audioguide via mobile phone?"
 msgstr "Аудіогід за допомогою мобільного телефону?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2317
 msgid "Phone number"
 msgstr "Номер телефону"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2319
 msgid "Other Information Points"
 msgstr "Інші інформаційні пункти"
 
 #. group "Leisure"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2326
 msgid "Leisure"
 msgstr "Дозвілля"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2327
 msgid "Cinema"
 msgstr "Кіно"
@@ -27811,10 +27996,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2330
 msgid "Edit Cinema"
 msgstr "Властивості Кінотеатру"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2334
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -27823,10 +28008,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2337
 msgid "Edit Zoo"
 msgstr "Властивості Зоопарку"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2343
 msgid "Dog Park"
 msgstr "Собачий майданчик"
@@ -27835,45 +28020,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2346
 msgid "Edit Dog Park"
 msgstr "Властивості Собачого майданчику"
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "Barrier"
 msgstr "Огорожа"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "fence"
 msgstr "паркан"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "wall"
 msgstr "стіна"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2354
 msgid "Theme Park"
 msgstr "Парк розваг"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2355
 msgid "Edit Theme Park"
 msgstr "Властивості Парку розваг"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2360
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2361
 msgid "Edit Water Park"
 msgstr "Властивості Аквапарку"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2365
 msgid "Sauna"
 msgstr "Сауна"
@@ -27883,5 +28068,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2353 build/trans_presets.java:2356
+#: build/trans_presets.java:2366 build/trans_presets.java:2369
 msgid "Edit Sauna"
 msgstr "Властивості Сауни"
@@ -27909,20 +28094,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2361 build/trans_presets.java:2472
-#: build/trans_presets.java:2593 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3499
-#: build/trans_presets.java:3548 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3712
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3762
-#: build/trans_presets.java:3784 build/trans_presets.java:3799
+#: build/trans_presets.java:2374 build/trans_presets.java:2485
+#: build/trans_presets.java:2606 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3512
+#: build/trans_presets.java:3561 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3725
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3775
+#: build/trans_presets.java:3797 build/trans_presets.java:3812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2375
 msgid "Access"
 msgstr "Дозволи"
@@ -27930,5 +28115,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2378
 msgid "Playground"
 msgstr "Ігровий майданчик"
@@ -27936,15 +28121,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2380
 msgid "Edit Playground"
 msgstr "Властивості Ігрового майданчику"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2384
 msgid "Picnic Site"
 msgstr "Місце для пікніка"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2385
 msgid "Edit Picnic Site"
 msgstr "Властивості Місця для пікніка"
@@ -27952,10 +28137,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2375 build/trans_presets.java:2702
+#: build/trans_presets.java:2388 build/trans_presets.java:2715
 msgid "Fireplace"
 msgstr "Вогнище"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2390
 msgid "Public Grill"
 msgstr "Мангал"
@@ -27963,15 +28148,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2392
 msgid "Edit Public Grill"
 msgstr "Властивості Мангалу"
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2396
 msgid "Covered"
 msgstr "Навіс"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgctxt "grill"
 msgid "Fuel"
@@ -27979,30 +28164,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "charcoal"
 msgstr "вугілля"
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "electric"
 msgstr "електрика"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2399
 msgid "Fishing"
 msgstr "Рибалка"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2400
 msgid "Edit Fishing"
 msgstr "Властивості місця для рибалки"
 
 #. group "Culture"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2405
 msgid "Culture"
 msgstr "Культура"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2406
 msgid "Museum"
 msgstr "Музей"
@@ -28010,10 +28195,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2408
 msgid "Edit Museum"
 msgstr "Властивості Музею"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2414
 msgid "Theatre"
 msgstr "Театр"
@@ -28022,10 +28207,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2417
 msgid "Edit Theatre"
 msgstr "Властивості Театру"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2421
 msgid "Library"
 msgstr "Бібліотека"
@@ -28034,10 +28219,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2424
 msgid "Edit Library"
 msgstr "Властивості Бібліотеки"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2429
 msgid "Arts Centre"
 msgstr "Центр мистецтв"
@@ -28045,10 +28230,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2431
 msgid "Edit Arts Centre"
 msgstr "Властивості Центру мистецтв"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2435
 msgid "Artwork"
 msgstr "Витвори мистецтв"
@@ -28056,10 +28241,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2437
 msgid "Edit Artwork"
 msgstr "Властивості Витворів мистецтв"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2441
 msgid "Place of Worship"
 msgstr "Культове місце"
@@ -28069,5 +28254,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2445
 msgid "Edit Place of Worship"
 msgstr "Властивості Культового місця"
@@ -28076,6 +28261,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "Religion"
 msgstr "Релігія"
@@ -28084,6 +28269,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "bahai"
 msgstr "бахаі"
@@ -28092,6 +28277,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "buddhist"
 msgstr "буддизм"
@@ -28100,6 +28285,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "christian"
 msgstr "християнство"
@@ -28108,6 +28293,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "hindu"
 msgstr "індуїзм"
@@ -28116,6 +28301,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jain"
 msgstr "джайнізм"
@@ -28124,6 +28309,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jewish"
 msgstr "іудаїзм"
@@ -28132,6 +28317,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "muslim"
 msgstr "іслам"
@@ -28140,6 +28325,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "sikh"
 msgstr "сикхізм"
@@ -28148,6 +28333,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "spiritualist"
 msgstr "спіритуалізм"
@@ -28156,6 +28341,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "taoist"
 msgstr "даосизм"
@@ -28164,6 +28349,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "unitarian"
 msgstr "уніатство"
@@ -28172,6 +28357,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "zoroastrian"
 msgstr "зороастризм"
@@ -28180,6 +28365,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "Denomination"
 msgstr "Віросповідання"
@@ -28188,6 +28373,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "anglican"
 msgstr "англіканська"
@@ -28196,6 +28381,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "baptist"
 msgstr "баптизм"
@@ -28204,6 +28389,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "catholic"
 msgstr "католицизм"
@@ -28212,6 +28397,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "evangelical"
 msgstr "євангелізм"
@@ -28220,6 +28405,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jehovahs_witness"
 msgstr "свідки ієгови"
@@ -28228,6 +28413,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "lutheran"
 msgstr "лютеранство"
@@ -28236,6 +28421,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "methodist"
 msgstr "методизм"
@@ -28244,6 +28429,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "mormon"
 msgstr "мормонство"
@@ -28252,6 +28437,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "orthodox"
 msgstr "православ’я"
@@ -28260,6 +28445,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "pentecostal"
 msgstr "п’ятидесятники"
@@ -28268,6 +28453,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "presbyterian"
 msgstr "пресвітеріанство"
@@ -28276,6 +28461,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "protestant"
 msgstr "протестантизм"
@@ -28284,6 +28469,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "quaker"
 msgstr "квакери"
@@ -28292,6 +28477,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "shia"
 msgstr "шиїти"
@@ -28300,38 +28485,36 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "sunni"
 msgstr "суніти"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2437
-#, fuzzy
+#: build/trans_presets.java:2450
 msgid "Service Times"
-msgstr "Придорожні послуги"
+msgstr "Розклад служінь"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:00"
-msgstr ""
+msgstr "Суб 10:00"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:30"
-msgstr ""
+msgstr "Нед 10:30"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 11:00"
-msgstr ""
+msgstr "Суб 11:00"
 
 #. item "Culture/Place of Worship" combo "Opening Hours for visiting"
-#: build/trans_presets.java:2438
-#, fuzzy
+#: build/trans_presets.java:2451
 msgid "Opening Hours for visiting"
-msgstr "Години роботи"
+msgstr "Години для відвідування"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2453
 msgid "Recording Studio"
 msgstr "Студія звукозапису"
@@ -28339,15 +28522,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2455
 msgid "Edit Studio"
 msgstr "Властивості Студії"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "audio"
 msgstr "звук"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "video"
 msgstr "відео"
@@ -28355,5 +28538,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2452 build/trans_presets.java:2453
+#: build/trans_presets.java:2465 build/trans_presets.java:2466
 msgid "Public Building"
 msgstr "Громадські будівлі"
@@ -28361,10 +28544,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2468
 msgid "Edit Public Building"
 msgstr "Властивості Громадської будівлі"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2472
 msgid "Town hall"
 msgstr "Міська державна адміністрація"
@@ -28372,5 +28555,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2474
 msgid "Edit Town hall"
 msgstr "Властивості Міської державної адміністрації"
@@ -28379,10 +28562,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2465 build/trans_presets.java:2467
+#: build/trans_presets.java:2478 build/trans_presets.java:2480
 msgid "Community Centre"
 msgstr "Суспільний центр"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2487
 msgid "Embassy"
 msgstr "Амбасада"
@@ -28390,10 +28573,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2489
 msgid "Edit Embassy"
 msgstr "Властивості Амбасади"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2493
 msgid "Courthouse"
 msgstr "Суд"
@@ -28402,10 +28585,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2496
 msgid "Edit Courthouse"
 msgstr "Властивості Суду"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2500
 msgid "Prison"
 msgstr "В’язниця"
@@ -28414,10 +28597,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2503
 msgid "Edit Prison"
 msgstr "Властивості В’язниці"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2507
 msgid "Police"
 msgstr "Поліція/міліція"
@@ -28427,10 +28610,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2511
 msgid "Edit Police"
 msgstr "Властивості Поліції/міліції"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2515
 msgid "Fire Station"
 msgstr "Пожежна станція"
@@ -28439,10 +28622,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2518
 msgid "Edit Fire Station"
 msgstr "Властивості Пожежного депо"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2522
 msgid "Post Office"
 msgstr "Пошта"
@@ -28450,25 +28633,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2524
 msgid "Edit Post Office"
 msgstr "Властивості Пошти"
 
 #. group "Education"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2530
 msgid "Education"
 msgstr "Освіта"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2531
 msgid "Kindergarten"
 msgstr "Дитячий садок"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2532
 msgid "Edit Kindergarten"
 msgstr "Властивості Дитячого саду"
 
 #. item "Education/School"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2536
 msgid "School"
 msgstr "Школа"
@@ -28476,10 +28659,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2538
 msgid "Edit School"
 msgstr "Властивості Школи"
 
 #. item "Education/University"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2542
 msgid "University"
 msgstr "Університет"
@@ -28487,10 +28670,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2544
 msgid "Edit University"
 msgstr "Властивості Університету"
 
 #. item "Education/College"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2548
 msgid "College"
 msgstr "Коледж"
@@ -28498,10 +28681,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2550
 msgid "Edit College"
 msgstr "Властивості коледжу"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2554
 msgid "Driving School"
 msgstr "Автошкола"
@@ -28509,20 +28692,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2556
 msgid "Edit Driving School"
 msgstr "Властивості Автошколи"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2561
 msgid "License Classes"
 msgstr "Класи з теоретичної підготовки"
 
 #. group "Health"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2564
 msgid "Health"
 msgstr "Медицина"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2565
 msgid "Hospital"
 msgstr "Лікарня"
@@ -28530,10 +28713,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2567
 msgid "Edit Hospital"
 msgstr "Властивості Лікарні"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2571
 msgid "Doctors"
 msgstr "Лікар"
@@ -28541,33 +28724,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2573
 msgid "Edit Doctors"
 msgstr "Властивості Лікаря"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2578
 msgid "Dentist"
 msgstr "Стоматологія"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2579
 msgid "Edit Dentist"
 msgstr "Властивості Стоматології"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2571
-#, fuzzy
+#: build/trans_presets.java:2584
 msgid "Nursing Home"
-msgstr "Схема нумерації"
+msgstr "Будинок пристарілих"
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2572
-#, fuzzy
+#: build/trans_presets.java:2585
 msgid "Edit Nursing Home"
-msgstr "Властивості Пішохідного переходу"
+msgstr "Властивості будинку пристарілих"
 
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2591
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -28575,5 +28756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2593
 msgid "Edit Pharmacy"
 msgstr "Властивості Аптеки"
@@ -28581,10 +28762,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2595
 msgid "Dispensing"
 msgstr "За рецептом"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2599
 msgid "Hearing Aids"
 msgstr "Слухові апарати"
@@ -28592,5 +28773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2601
 msgid "Edit Hearing Aids"
 msgstr "Властивості Слухових апаратів"
@@ -28598,5 +28779,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2609
 msgid "Baby Hatch"
 msgstr "Вікно для покинутих немовлят"
@@ -28604,5 +28785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2611
 msgid "Edit Baby Hatch"
 msgstr "Властивості Вікна для покинутих немовлят"
@@ -28610,5 +28791,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2617
 msgid "Emergency Access Point"
 msgstr "Пункт швидкої допомоги"
@@ -28617,5 +28798,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2620
 msgid "Edit Emergency Access Point"
 msgstr "Властивості Пункту швидкої допомоги"
@@ -28624,15 +28805,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2623
 msgid "Point Number"
 msgstr "Номер пункту"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2624
 msgid "Point Name"
 msgstr "Назва пункту"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2627
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
@@ -28641,5 +28822,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2631
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -28648,10 +28829,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2634
 msgid "Edit Veterinary"
 msgstr "Властивості Ветеренарного пункту"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2648
 msgid "limited"
 msgstr "обмежений"
@@ -28659,15 +28840,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2636 build/trans_presets.java:3809
+#: build/trans_presets.java:2649 build/trans_presets.java:3822
 msgid "Note"
 msgstr "Примітка"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2651
 msgid "Post Box"
 msgstr "Поштова скринька"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2656
 msgid "Telephone"
 msgstr "Телефон"
@@ -28676,15 +28857,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2659
 msgid "Edit Telephone"
 msgstr "Властивості телефону"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2667
 msgid "Telephone cards"
 msgstr "Телефонні картки"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2669
 msgid "Clock"
 msgstr "Годинник"
@@ -28693,5 +28874,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2672
 msgid "Edit Clock"
 msgstr "Властивості годинника"
@@ -28701,5 +28882,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgid "Display"
 msgstr "Циферблат"
@@ -28707,6 +28888,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "analog"
@@ -28715,6 +28895,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "digital"
@@ -28722,13 +28901,11 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "sundial"
-msgstr "сонячний годинник"
+msgstr "сонячний"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "unorthodox"
@@ -28736,60 +28913,60 @@
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "Support"
 msgstr "Розташуваний на"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "pole"
 msgstr "стовп"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "wall_mounted"
 msgstr "стіні"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "billboard"
 msgstr "стенді для оголошень"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "Visibility/readability"
 msgstr "Видно з відстані"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 5m)"
 msgstr "(до 5 м)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 20m)"
 msgstr "(до 20 м)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(more than 20m)"
 msgstr "(більше ніж 20 м)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2678
 msgid "Shows current date"
 msgstr "Показує поточну дату"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2679
 msgid "Shows temperature"
 msgstr "Показує температуру"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2680
 msgid "Shows barometric pressure"
 msgstr "Показує атмосферний тиск"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2681
 msgid "Shows humidity"
 msgstr "Показує вологість"
@@ -28797,5 +28974,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2684
 msgid "Recycling"
 msgstr "Пункт прийому вторинної сировини"
@@ -28804,5 +28981,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2687
 msgid "Edit Recycling station"
 msgstr "Властивості Пункту прийому вторинної сировини"
@@ -28810,40 +28987,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2689
 msgid "Batteries"
 msgstr "Батарейки/Акумулятори"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2690
 msgid "Cans"
 msgstr "Бляшанки"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2692
 msgid "Glass"
 msgstr "Скло"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2693
 msgid "Paper"
 msgstr "Папір"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2694
 msgid "Scrap Metal"
 msgstr "Металобрухт"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "container"
 msgstr "контейнер"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "centre"
 msgstr "центр"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2697
 msgid "Waste Basket"
 msgstr "Урна для сміття"
@@ -28851,5 +29028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2699
 msgid "Edit Waste Basket"
 msgstr "Властивості Урни для сміття"
@@ -28858,30 +29035,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2706
 msgid "Backrest"
 msgstr "Спинка"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "Material"
 msgstr "Матеріал"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "stone"
 msgstr "камінь"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "plastic"
 msgstr "пластик"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgid "Colour"
 msgstr "Колір"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "black"
@@ -28889,5 +29066,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "brown"
@@ -28895,5 +29072,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "green"
@@ -28901,5 +29078,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "red"
@@ -28907,5 +29084,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "blue"
@@ -28913,5 +29090,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "gray"
@@ -28919,5 +29096,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "white"
@@ -28925,20 +29102,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2709
 msgid "Amount of Seats"
 msgstr "Кількість місць"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2712
 msgid "Edit Shelter"
 msgstr "Властивості Навісу"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgid "Type of shelter"
 msgstr "Тип укриття"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -28946,5 +29123,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "public_transport"
@@ -28952,5 +29129,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -28958,5 +29135,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -28964,10 +29141,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2718
 msgid "Hunting Stand"
 msgstr "Мисливська вежа"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2719
 msgid "Edit Hunting Stand"
 msgstr "Властивості Мисливської вежі"
@@ -28976,10 +29153,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2708 build/trans_presets.java:4000
+#: build/trans_presets.java:2721 build/trans_presets.java:4013
 msgid "Height"
 msgstr "Висота"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -28987,20 +29164,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "half"
 msgstr "половинна"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "full"
 msgstr "повна"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2723
 msgid "Hide"
 msgstr "Прихована"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2724
 msgid "Lock"
 msgstr "Зачиняється"
@@ -29008,5 +29185,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2727
 msgid "Drinking Water"
 msgstr "Питна вода"
@@ -29015,10 +29192,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2730
 msgid "Edit Drinking Water"
 msgstr "Властивості Питної води"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2734
 msgid "Fire Hydrant"
 msgstr "Пожежний гідрант"
@@ -29027,5 +29204,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2737
 msgid "Edit Fire Hydrant"
 msgstr "Властивості Пожежного гідранту"
@@ -29033,5 +29210,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2726 build/trans_presets.java:3124
+#: build/trans_presets.java:2739 build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underground"
@@ -29039,5 +29216,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pillar"
@@ -29045,5 +29222,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "wall"
@@ -29051,5 +29228,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pond"
@@ -29057,10 +29234,10 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2740
 msgid "Diameter"
 msgstr "Діаметр"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "lane"
@@ -29068,5 +29245,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -29074,5 +29251,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -29080,5 +29257,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "green"
@@ -29086,20 +29263,20 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "Pressure"
 msgstr "Тиск"
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "xx l/min"
 msgstr "xx л/хв"
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "suction"
 msgstr "всмоктування"
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2748
 msgid "Count"
 msgstr "Кількість"
@@ -29107,20 +29284,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2739 build/trans_presets.java:3514
+#: build/trans_presets.java:2752 build/trans_presets.java:3527
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2753
 msgid "Sport Facilities"
 msgstr "Спортивні споруди"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2754
 msgid "Stadium"
 msgstr "Стадіон"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2755
 msgid "Edit Stadium"
 msgstr "Властивості Стадіону"
@@ -29134,6 +29311,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2764 build/trans_presets.java:2773
+#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "select sport:"
 msgstr "види спорту:"
@@ -29479,6 +29656,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -29516,6 +29693,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "multi"
 msgstr "багатоборство"
@@ -29525,6 +29702,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "archery"
 msgstr "стрільба з лука"
@@ -29534,6 +29711,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "athletics"
 msgstr "атлетика"
@@ -29543,6 +29720,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "american_football"
 msgstr "американський футбол"
@@ -29552,6 +29729,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "australian_football"
 msgstr "австралійський футбол"
@@ -29561,6 +29738,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "baseball"
 msgstr "бейсбол"
@@ -29570,6 +29747,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "basketball"
 msgstr "баскетбол"
@@ -29579,6 +29756,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "boules"
 msgstr "боче (петанк)"
@@ -29588,6 +29765,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "bowls"
 msgstr "боулз"
@@ -29597,6 +29774,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canadian_football"
 msgstr "канадський футбол"
@@ -29606,6 +29783,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canoe"
 msgstr "каное"
@@ -29615,6 +29792,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "climbing"
 msgstr "скелелазіння"
@@ -29624,6 +29801,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket"
 msgstr "крикет"
@@ -29633,6 +29810,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket_nets"
 msgstr "тренувальні сітки для крикету"
@@ -29642,6 +29819,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "croquet"
 msgstr "крокет"
@@ -29651,6 +29828,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cycling"
 msgstr "велоспорт"
@@ -29660,6 +29837,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "dog_racing"
 msgstr "собачі перегони"
@@ -29669,6 +29846,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "equestrian"
 msgstr "кінний спорт"
@@ -29678,6 +29855,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gaelic_football"
 msgstr "гаельський футбол"
@@ -29687,6 +29864,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "golf"
 msgstr "гольф"
@@ -29696,6 +29873,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gymnastics"
 msgstr "гімнастика"
@@ -29705,6 +29882,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "hockey"
 msgstr "хокей"
@@ -29714,6 +29891,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "horse_racing"
 msgstr "кінські перегони"
@@ -29723,6 +29900,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "motor"
 msgstr "мотоспорт"
@@ -29732,6 +29909,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "pelota"
 msgstr "пелота"
@@ -29741,6 +29918,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "racquet"
 msgstr "ракетбол"
@@ -29750,6 +29927,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_league"
 msgstr "ліга регбі"
@@ -29759,6 +29936,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_union"
 msgstr "союз регбі"
@@ -29768,6 +29945,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "shooting"
 msgstr "стрільба"
@@ -29777,6 +29954,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skateboard"
 msgstr "скейтборд"
@@ -29786,6 +29963,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skating"
 msgstr "катання на ковзанах"
@@ -29795,6 +29972,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skiing"
 msgstr "катання на лижах"
@@ -29804,6 +29981,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "soccer"
 msgstr "футбол"
@@ -29813,6 +29990,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "swimming"
 msgstr "плавання"
@@ -29822,6 +29999,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "table_tennis"
 msgstr "настільний теніс"
@@ -29831,71 +30008,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "tennis"
 msgstr "теніс"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2763
 msgid "Sports Centre"
 msgstr "Спортивний центр"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2764
 msgid "Edit Sports Centre"
 msgstr "Властивості Спортивного центру"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2772
 msgid "Pitch"
 msgstr "Спортивний майданчик"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2773
 msgid "Edit Pitch"
 msgstr "Властивості Спортивного майданчику"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2781
 msgid "Racetrack"
 msgstr "Бігова доріжка"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2782
 msgid "Edit Racetrack"
 msgstr "Властивості Бігової доріжки"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2790
 msgid "Golf Course"
 msgstr "Поле для гольфу"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2791
 msgid "Edit Golf Course"
 msgstr "Властивості Поля для гольфу"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2796
 msgid "Miniature Golf"
 msgstr "Міні-гольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2797
 msgid "Edit Miniature Golf"
 msgstr "Властивості Поля для міні-гольфу"
 
 #. group "Sport"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2803
 msgid "Sport"
 msgstr "Спорт"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2804
 msgid "Multi"
 msgstr "Багатоборство"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2805
 msgid "Edit Multi"
 msgstr "Правити Багатоборство"
@@ -29943,25 +30120,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "type"
 msgstr "тип"
@@ -30011,26 +30188,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "pitch"
 msgstr "спортивний майданчик"
@@ -30080,26 +30257,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "sports_centre"
 msgstr "спортивний центр"
@@ -30144,215 +30321,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050
 msgid "stadium"
 msgstr "стадіон"
 
-#. item "Sport/Multi" combo "type" display value
-#. item "Sport/10pin" combo "type" display value
-#. item "Sport/Athletics" combo "type" display value
-#. item "Sport/Archery" combo "type" display value
-#. item "Sport/Climbing" combo "type" display value
-#. item "Sport/Canoeing" combo "type" display value
-#. item "Sport/Cycling" combo "type" display value
-#. item "Sport/Dog Racing" combo "type" display value
-#. item "Sport/Equestrian" combo "type" display value
-#. item "Sport/Horse Racing" combo "type" display value
-#. item "Sport/Gymnastics" combo "type" display value
-#. item "Sport/Skating" combo "type" display value
-#. item "Sport/Skateboard" combo "type" display value
-#. item "Sport/Swimming" combo "type" display value
-#. item "Sport/Skiing" combo "type" display value
-#. item "Sport/Shooting" combo "type" display value
-#. item "Sport (Ball)/Soccer" combo "type" display value
-#. item "Sport (Ball)/Australian Football" combo "type" display value
-#. item "Sport (Ball)/American Football" combo "type" display value
-#. item "Sport (Ball)/Canadian Football" combo "type" display value
-#. item "Sport (Ball)/Gaelic Football" combo "type" display value
-#. item "Sport (Ball)/Rugby League" combo "type" display value
-#. item "Sport (Ball)/Rugby Union" combo "type" display value
-#. item "Sport (Ball)/Baseball" combo "type" display value
-#. item "Sport (Ball)/Basketball" combo "type" display value
-#. item "Sport (Ball)/Golf" combo "type" display value
-#. item "Sport (Ball)/Boule" combo "type" display value
-#. item "Sport (Ball)/Bowls" combo "type" display value
-#. item "Sport (Ball)/Cricket" combo "type" display value
-#. item "Sport (Ball)/Cricket Nets" combo "type" display value
-#. item "Sport (Ball)/Croquet" combo "type" display value
-#. item "Sport (Ball)/Hockey" combo "type" display value
-#. item "Sport (Ball)/Pelota" combo "type" display value
-#. item "Sport (Ball)/Racquet" combo "type" display value
-#. item "Sport (Ball)/Table Tennis" combo "type" display value
-#. item "Sport (Ball)/Tennis" combo "type" display value
-#. item "Motorsport/Motorsport" combo "type" display value
-#. item "Motorsport/Karting" combo "type" display value
-#. item "Motorsport/Motocross" combo "type" display value
-#. item "Motorsport/Safety Training" combo "type" display value
-#. item "Motorsport/Model Aerodrome" combo "type" display value
-#. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-msgid "track"
-msgstr "бігова доріжка"
-
 #. item "Sport/10pin"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2810
 msgid "10pin"
 msgstr "Боулінг (10-кегельний)"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2811
 msgid "Edit 10pin"
 msgstr "Властивості Боулінгу"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2816
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2817
 msgid "Edit Athletics"
 msgstr "Властивості Атлетики"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2822
 msgid "Archery"
 msgstr "Стрільба з лука"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2823
 msgid "Edit Archery"
 msgstr "Властивості Стрільби з лука"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2828
 msgid "Climbing"
 msgstr "Скелелазіння"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2829
 msgid "Edit Climbing"
 msgstr "Властивості Скелелазіння"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2834
 msgid "Canoeing"
 msgstr "Веслування"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2835
 msgid "Edit Canoeing"
 msgstr "Властивості Каное"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2841
 msgid "Edit Cycling"
 msgstr "Властивості Велоспорту"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2846
 msgid "Dog Racing"
 msgstr "Собачі перегони"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2847
 msgid "Edit Dog Racing"
 msgstr "Властивості Собачих перегонів"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2852
 msgid "Equestrian"
 msgstr "Кінний спорт"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2853
 msgid "Edit Equestrian"
 msgstr "Властивості Кінного спорту"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2858
 msgid "Horse Racing"
 msgstr "Кінні перегони"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2859
 msgid "Edit Horse Racing"
 msgstr "Властивості Кінських перегонів"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2864
 msgid "Gymnastics"
 msgstr "Гімнастика"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2865
 msgid "Edit Gymnastics"
 msgstr "Властивості Гімнастики"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2870
 msgid "Skating"
 msgstr "Катання на ковзанах"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2871
 msgid "Edit Skating"
 msgstr "Властивості Катання на ковзанах"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2876
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2877
 msgid "Edit Skateboard"
 msgstr "Властивості Скейтбордингу"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2882
 msgid "Swimming"
 msgstr "Плавання"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2883
 msgid "Edit Swimming"
 msgstr "Властивості Плавання"
@@ -30360,60 +30471,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2890
 msgid "Edit Skiing"
 msgstr "Властивості Катання на лижах"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "Piste type"
 msgstr "Тип лижні"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "downhill"
 msgstr "гірські лижі"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "nordic"
 msgstr "бігові лижі"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "snow_park"
 msgstr "сніговий парк"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "Difficulty"
 msgstr "Складність"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "novice"
 msgstr "початковий рівень"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "easy"
 msgstr "легкий рівень"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "advanced"
 msgstr "складний рівень"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "expert"
 msgstr "для професіоналів"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "freeride"
 msgstr "фрірайд"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2897
 msgid "Shooting"
 msgstr "Стрільба"
@@ -30421,105 +30532,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2899
 msgid "Edit Shooting"
 msgstr "Властивості Стрільби"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2905
 msgid "Sport (Ball)"
 msgstr "Спорт (з м’ячем)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2906
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2907
 msgid "Edit Soccer"
 msgstr "Властивості Футболу"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2912
 msgid "Australian Football"
 msgstr "Австралійський футбол"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2913
 msgid "Edit Australian Football"
 msgstr "Властивості Австралійського футболу"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2918
 msgid "American Football"
 msgstr "Американський футбол"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2919
 msgid "Edit American Football"
 msgstr "Властивості Американського футболу"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2924
 msgid "Canadian Football"
 msgstr "Канадський футбол"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2925
 msgid "Edit Canadian Football"
 msgstr "Властивості Канадського футболу"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2930
 msgid "Gaelic Football"
 msgstr "Гаельський футбол"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2931
 msgid "Edit Gaelic Football"
 msgstr "Властивості Гаельського футболу"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2936
 msgid "Rugby League"
 msgstr "Ліга регбі"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2937
 msgid "Edit Rugby League"
 msgstr "Властивості Ліги регбі"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2942
 msgid "Rugby Union"
 msgstr "Союз регбі"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2943
 msgid "Edit Rugby Union"
 msgstr "Властивості Союзу регбі"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2948
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2949
 msgid "Edit Baseball"
 msgstr "Властивості Бейсболу"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2954
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2955
 msgid "Edit Basketball"
 msgstr "Властивості Бейсболу"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2960
 msgid "Volleyball"
 msgstr "Волейбол"
@@ -30527,10 +30638,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2962
 msgid "Edit Volleyball"
 msgstr "Властивості Волейболу"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2969
 msgid "Beachvolleyball"
 msgstr "Пляжний Волейбол"
@@ -30538,120 +30649,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2971
 msgid "Edit Beachvolleyball"
 msgstr "Властивості Пляжного Волейболу"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2978
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2979
 msgid "Edit Golf"
 msgstr "Властивості Гольфу"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2982
 msgid "golf_course"
 msgstr "поле для гольфу"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2984
 msgid "Boule"
 msgstr "Боче"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2985
 msgid "Edit Boule"
 msgstr "Властивості боче"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2990
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2991
 msgid "Edit Bowls"
 msgstr "Властивості Боулз"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2996
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2997
 msgid "Edit Cricket"
 msgstr "Властивості Крикету"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3002
 msgid "Cricket Nets"
 msgstr "Тренувальні сітки для крикету"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3003
 msgid "Edit Cricket Nets"
 msgstr "Властивості Тренувальних сіток для крикету"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3008
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3009
 msgid "Edit Croquet"
 msgstr "Властивості Крокету"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3014
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3015
 msgid "Edit Hockey"
 msgstr "Властивості Хокею"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3020
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3021
 msgid "Edit Pelota"
 msgstr "Властивості Пелоти"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3026
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3027
 msgid "Edit Racquet"
 msgstr "Властивості Ракетболу"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3032
 msgid "Table Tennis"
 msgstr "Настільний теніс"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3033
 msgid "Edit Table Tennis"
 msgstr "Властивості Настільного тенісу"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3038
 msgid "Tennis"
 msgstr "Теніс"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3039
 msgid "Edit Tennis"
 msgstr "Властивості Тенісу"
@@ -30659,40 +30770,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:3032 build/trans_presets.java:3033
+#: build/trans_presets.java:3045 build/trans_presets.java:3046
 msgid "Motorsport"
 msgstr "Мотоспорт"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3047
 msgid "Edit Motorsport"
 msgstr "Властивості Мотоспорту"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3052
 msgid "Karting"
 msgstr "Картинг"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3053
 msgid "Edit Karting"
 msgstr "Властивості Картингу"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3058
 msgid "Motocross"
 msgstr "Мотокрос"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3059
 msgid "Edit Motocross"
 msgstr "Властивості мотокросу"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3064
 msgid "Safety Training"
 msgstr "Курси контраварійного водіння"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3065
 msgid "Edit Safety Training"
 msgstr "Властивості Курсів контраварійного водіння"
@@ -30700,20 +30811,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3071
 msgid "Model Aerodrome"
 msgstr "Аеродром для авіамоделей"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3072
 msgid "Edit Model Aerodrome"
 msgstr "Властивості Аеродрому для авіамоделей"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3077
 msgid "RC Car"
 msgstr "Дистанційно керовані автомобілі"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3078
 msgid "Edit RC Car"
 msgstr "Властивості Дистанційно керованих автомобілів"
@@ -30721,10 +30832,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:3072 build/trans_presets.java:3073
+#: build/trans_presets.java:3085 build/trans_presets.java:3086
 msgid "Man Made"
 msgstr "Штучні об’єкти"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3087
 msgid "Building"
 msgstr "Будівля"
@@ -30732,25 +30843,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3090
 msgid "Tower"
 msgstr "Башта"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3091
 msgid "Edit Tower"
 msgstr "Властивості Башти"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "Tower type"
 msgstr "Тип Башти"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "communication"
 msgstr "зв’язку"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "observation"
 msgstr "спостереження"
@@ -30759,5 +30870,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:3083 build/trans_presets.java:3104
+#: build/trans_presets.java:3096 build/trans_presets.java:3117
 msgid "Height (meters)"
 msgstr "Висота (в метрах)"
@@ -30765,5 +30876,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3100
 msgid "Flagpole"
 msgstr "Флагшток"
@@ -30773,15 +30884,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3105
 msgid "Works"
 msgstr "Заводи"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3106
 msgid "Edit Works"
 msgstr "Властивості Заводів"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3110
 msgid "Chimney"
 msgstr "Димохід"
@@ -30789,10 +30900,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3112
 msgid "Edit Chimney"
 msgstr "Властивості Димоходу"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3119
 msgid "Windmill"
 msgstr "Вітряк"
@@ -30800,20 +30911,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3121
 msgid "Edit Windmill"
 msgstr "Властивості Вітряка"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3125
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3126
 msgid "Edit Gasometer"
 msgstr "Властивості Газгольдера"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3130
 msgid "Pipeline"
 msgstr "Трубопровід"
@@ -30822,5 +30933,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3133
 msgid "Edit Pipeline"
 msgstr "Властивості Трубопроводу"
@@ -30864,5 +30975,5 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:3123 build/trans_style.java:817
+#: build/trans_presets.java:3136 build/trans_style.java:817
 #: build/trans_style.java:830 build/trans_style.java:842
 #: build/trans_style.java:847 build/trans_style.java:2936
@@ -30875,10 +30986,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "heat"
 msgstr "тепло"
@@ -30886,20 +30997,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "oil"
 msgstr "нафта"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "sewage"
 msgstr "каналізація"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgid "Location"
 msgstr "Розташування"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underwater"
@@ -30907,5 +31018,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "overground"
@@ -30913,5 +31024,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3139
 msgid "Crane"
 msgstr "Кран"
@@ -30919,10 +31030,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3141
 msgid "Edit Crane"
 msgstr "Властивості Крану"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3145
 msgid "Mineshaft"
 msgstr "Вертикальний тунель"
@@ -30931,25 +31042,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3148
 msgid "Edit Mineshaft"
 msgstr "Властивості Вериткального тунелю"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "Function"
 msgstr "Призначення"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "winding"
 msgstr "для тросів"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "air"
 msgstr "вентиляційний"
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3152
 msgid "Depth in meters"
 msgstr "Глибина в метрах"
@@ -30957,5 +31068,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "Resource"
 msgstr "Видобувається"
@@ -30963,5 +31074,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "aggregate"
 msgstr "заповнювач для бетону"
@@ -30969,5 +31080,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "bauxite"
 msgstr "боксит"
@@ -30976,6 +31087,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3263
 msgid "coal"
 msgstr "вугілля"
@@ -30983,5 +31094,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "copper"
 msgstr "мідь"
@@ -30989,5 +31100,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "dimension_stone"
 msgstr "кам’яні блоки"
@@ -30995,5 +31106,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "gold"
 msgstr "золото"
@@ -31001,5 +31112,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "ilmenite"
 msgstr "ільменіт"
@@ -31007,5 +31118,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "iron_ore"
 msgstr "залізна руда"
@@ -31013,5 +31124,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "lead"
 msgstr "свинець"
@@ -31019,5 +31130,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "limestone"
 msgstr "вапняк"
@@ -31025,5 +31136,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "nickel"
 msgstr "нікель"
@@ -31031,5 +31142,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "rutile"
 msgstr "рутіл"
@@ -31037,5 +31148,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "salt"
 msgstr "сіль"
@@ -31043,5 +31154,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "silver"
 msgstr "срібло"
@@ -31049,5 +31160,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "tin"
 msgstr "олово"
@@ -31055,5 +31166,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zinc"
 msgstr "цинк"
@@ -31061,10 +31172,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zircon"
 msgstr "циркон"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3155
 msgid "Visible Headframe"
 msgstr "Видима кліть на горі"
@@ -31072,10 +31183,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:3143 build/trans_presets.java:3153
+#: build/trans_presets.java:3156 build/trans_presets.java:3166
 msgid "Disused"
 msgstr "Не використовується"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3158
 msgid "Adit"
 msgstr "Штольня"
@@ -31083,10 +31194,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3160
 msgid "Edit Adit"
 msgstr "Властивості Штольні"
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3163
 msgid "Length in meters"
 msgstr "Довжина в метрах"
@@ -31094,15 +31205,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3169
 msgid "Water Tower"
 msgstr "Водонапірна вежа"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3170
 msgid "Edit Water Tower"
 msgstr "Властивості Водонапірної вежі"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3174
 msgid "Water Works"
 msgstr "Водозабір"
@@ -31110,10 +31221,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3176
 msgid "Edit Water Works"
 msgstr "Властивості Водозабору"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3182
 msgid "Wastewater Plant"
 msgstr "Очисні споруди"
@@ -31123,10 +31234,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3186
 msgid "Edit Wastewater Plant"
 msgstr "Властивості Очисних споруд"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3190
 msgid "Watermill"
 msgstr "Водяний млин"
@@ -31134,10 +31245,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:3192
 msgid "Edit Watermill"
 msgstr "Властивості Водяного млину"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3197
 msgid "Fountain"
 msgstr "Фонтан"
@@ -31146,10 +31257,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3200
 msgid "Edit Fountain"
 msgstr "Властивості Фонтану"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3204
 msgid "Water Well"
 msgstr "Колодязь"
@@ -31157,5 +31268,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3206
 msgid "Edit Water Well"
 msgstr "Властивості Колодязю"
@@ -31163,5 +31274,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3211
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -31169,5 +31280,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3213
 msgid "Edit Lighthouse"
 msgstr "Властивості Маяка"
@@ -31175,10 +31286,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3219
 msgid "Edit Beacon"
 msgstr "Властивості Сигнального вогню"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3223
 msgid "Street Lamp"
 msgstr "Вуличний ліхтар"
@@ -31186,5 +31297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3225
 msgid "Edit Street Lamp"
 msgstr "Властивості Вуличного ліхтаря"
@@ -31193,15 +31304,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Operation times"
 msgstr "Час роботи"
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Mo-Fr 22:00-05:00"
 msgstr "Пн-Пт 22:00-05:00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3230
 msgid "Measurement Station"
 msgstr "Вимірювальна станція"
@@ -31209,62 +31320,61 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3232
 msgid "Edit Measurement Station"
 msgstr "Властивості Вимірювальної станції"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "Measurement"
 msgstr "Вимірювання"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "particulate_matter"
 msgstr "твердих часток"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "seismic"
 msgstr "сейсмічна"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "water_level"
 msgstr "рівня води"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "weather"
 msgstr "погодна"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "Recording"
 msgstr "Рейстрація"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "manually"
 msgstr "вручну"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "automated"
 msgstr "автоматично"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "remote"
 msgstr "віддалено"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:3239
 msgctxt "display"
 msgid "no"
-msgstr "ні"
+msgstr "немає"
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3241
 msgid "Survey Point"
 msgstr "Геодезичний пункт"
@@ -31272,10 +31382,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3243
 msgid "Edit Survey Point"
 msgstr "Властивості Геодезичного пункту"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3247
 msgid "Surveillance"
 msgstr "Камера спостереження"
@@ -31283,30 +31393,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3249
 msgid "Edit Surveillance Camera"
 msgstr "Властивості Камери спостереження"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "indoor"
 msgstr "внутрішня"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "outdoor"
 msgstr "зовнішня"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "public"
 msgstr "загальнодоступне"
 
 #. group "Power"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3255
 msgid "Power"
 msgstr "Енергетика"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3256
 msgid "Power Generator"
 msgstr "Електростанція"
@@ -31316,148 +31426,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3260
 msgid "Edit Power Generator"
 msgstr "Властивості Електростанції"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biofuel"
 msgstr "біопаливо"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biogas"
 msgstr "біогаз"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biomass"
 msgstr "біомаса"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "diesel"
-msgstr "Дизельне"
+msgstr "дизпаливо"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "gasoline"
-msgstr "в мережі"
+msgstr "бензин"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "geothermal"
 msgstr "геотермальний"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "hydro"
 msgstr "гідро"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "nuclear"
 msgstr "атомна"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "osmotic"
-msgstr "повідомлення"
+msgstr "осмотичний"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "solar"
 msgstr "сонце"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "tidal"
-msgstr "припливно-відливні ділянки"
+msgstr "приливи"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "waste"
 msgstr "відходи"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wave"
-msgstr ""
+msgstr "хвилі"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wind"
 msgstr "вітряна"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "Method"
 msgstr "Спосіб"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "anaerobic_digestion"
 msgstr "анаеробне перетравлення"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "combustion"
 msgstr "спалювання"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "dam"
-msgstr "Дамба"
+msgstr "гребля"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "fission"
 msgstr "розщеплення"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "fusion"
-msgstr "розщеплення"
+msgstr "злиття"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "gasification"
 msgstr "газифікація"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "photovoltaic"
 msgstr "сонячна"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumped-storage"
-msgstr "Сила струму"
+msgstr "гідроакумулятор"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumping"
-msgstr "Кемпінг"
+msgstr "накачування"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pyrolysis"
-msgstr ""
+msgstr "піроліз"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "run-of-the-river"
-msgstr ""
+msgstr "річковий потік"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "thermal"
 msgstr "тепловий"
@@ -31465,13 +31567,12 @@
 #. <space />
 #. item "Power/Power Generator" label "Output forms of energy"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3266
 msgid "Output forms of energy"
-msgstr ""
+msgstr "Енергія, що генерується"
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3254
-#, fuzzy
+#: build/trans_presets.java:3267
 msgid "electricity"
-msgstr "електрика"
+msgstr "електрична"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -31484,11 +31585,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "2 W"
-msgstr ""
+msgstr "2 W"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -31501,11 +31602,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "3 kW"
-msgstr ""
+msgstr "3 kW"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -31518,11 +31619,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "5 MW"
-msgstr ""
+msgstr "5 MW"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -31535,56 +31636,54 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "7 GW"
-msgstr ""
+msgstr "7 GW"
 
 #. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3255
-#, fuzzy
+#: build/trans_presets.java:3268
 msgid "hot water"
-msgstr "вода"
+msgstr "гаряча вода"
 
 #. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3269
 msgid "hot air"
-msgstr ""
+msgstr "гаряче повітря"
 
 #. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3257
-#, fuzzy
+#: build/trans_presets.java:3270
 msgid "cold water"
-msgstr "вода"
+msgstr "холодна вода"
 
 #. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3271
 msgid "cold air"
-msgstr ""
+msgstr "холодне повітря"
 
 #. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3272
 msgid "compressed air"
-msgstr ""
+msgstr "стиснене повітря"
 
 #. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3273
 msgid "steam"
-msgstr ""
+msgstr "пар"
 
 #. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3274
 msgid "vacuum"
-msgstr ""
+msgstr "вакуум"
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3275
 msgid "battery charging"
-msgstr ""
+msgstr "зарядка батарей"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3277
 msgid "Power Station"
 msgstr "Електропідстанція"
@@ -31593,10 +31692,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3280
 msgid "Edit Power Station"
 msgstr "Властивості Електропідстанції"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3286
 msgid "Power Sub Station"
 msgstr "Трансформаторна будка"
@@ -31605,5 +31704,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3289
 msgid "Edit Power Sub Station"
 msgstr "Властивості Трансформаторної будки"
@@ -31611,10 +31710,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3279 build/trans_presets.java:3312
+#: build/trans_presets.java:3292 build/trans_presets.java:3325
 msgid "Line reference"
 msgstr "назва (номер) мережі"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3294
 msgid "Cable Distribution Cabinet"
 msgstr "Кабельна розподільча шафа"
@@ -31623,5 +31722,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3297
 msgid "Edit Cable Distribution Cabinet"
 msgstr "Властивості Кабельної розподільчої шафи"
@@ -31629,5 +31728,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3303
 msgid "Power Tower"
 msgstr "Опора ЛЕП"
@@ -31638,5 +31737,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3295
+#: build/trans_presets.java:3308
 msgid "Edit Power Tower"
 msgstr "Властивості Опори ЛЕП"
@@ -31644,10 +31743,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3310
 msgid "Tower reference"
 msgstr "Номер опори"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3312
 msgid "Pole"
 msgstr "Опора"
@@ -31656,5 +31755,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:3315
 msgid "Edit Power Pole"
 msgstr "Властивості Опори"
@@ -31662,10 +31761,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:3317
 msgid "Pole reference"
 msgstr "Номер опори"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3319
 msgid "Power Line"
 msgstr "Лінія електропередач"
@@ -31674,15 +31773,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3322
 msgid "Edit Power Line"
 msgstr "Властивості Лінії електропередач"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgid "Line type"
 msgstr "Тип лінії"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "line"
@@ -31690,5 +31789,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "minor_line"
@@ -31696,40 +31795,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3328
 msgid "Amount of Cables"
 msgstr "Кількість кабелів"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Кількість проводів (краще: провідників) на кабель"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "single"
 msgstr "один провід"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "double"
 msgstr "два проводи"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "triple"
 msgstr "три проводи"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "quad"
 msgstr "чотири проводи"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3332
 msgid "Historic Places"
 msgstr "Історичні місця"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3320
+#: build/trans_presets.java:3333
 msgid "Castle"
 msgstr "За́мок"
@@ -31738,20 +31837,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3336
 msgid "Edit Castle"
 msgstr "Властивості Замку"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3341
 msgid "Ruins"
 msgstr "Руїни"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3342
 msgid "Edit Ruins"
 msgstr "Властивості Руїн"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3347
 msgid "Archaeological Site"
 msgstr "Археологічні пам’ятки"
@@ -31760,10 +31859,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3337
+#: build/trans_presets.java:3350
 msgid "Edit Archaeological Site"
 msgstr "Властивості Археологічних пам’яток"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3355
 msgid "Battlefield"
 msgstr "Поле бою"
@@ -31771,10 +31870,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3344
+#: build/trans_presets.java:3357
 msgid "Edit Battlefield"
 msgstr "Властивості Поля бою"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3361
 msgid "Palaeontological Site"
 msgstr "Палеонтологічні пам’ятки"
@@ -31782,5 +31881,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3363
 msgid "Edit Palaeontological Site"
 msgstr "Властивості Палеонтологічних пам’яток"
@@ -31788,15 +31887,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3368
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3369
 msgid "Edit Monument"
 msgstr "Властивості Монументу"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3373
 msgid "Memorial"
 msgstr "Пам’ятник"
@@ -31804,60 +31903,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3375
 msgid "Edit Memorial"
 msgstr "Властивості Пам’ятнику"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3379
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3380
 msgid "Edit Wayside Cross"
 msgstr "Властивості Придорожнього Хреста"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3371
+#: build/trans_presets.java:3384
 msgid "Wayside Shrine"
 msgstr "Придорожня Рака"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3385
 msgid "Edit Wayside Shrine"
 msgstr "Властивості Придорожньої Раки"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3376
+#: build/trans_presets.java:3389
 msgid "Boundary Stone"
 msgstr "Прикордонний камінь"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3377
+#: build/trans_presets.java:3390
 msgid "Edit Boundary Stone"
 msgstr "Властивості Прикордонного каменя"
 
 #. group "Shops"
-#: build/trans_presets.java:3383
+#: build/trans_presets.java:3396
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3397
 msgid "Food"
 msgstr "Харчування"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3398
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3399
 msgid "Edit Supermarket"
 msgstr "Властивості Супермаркету"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3391
+#: build/trans_presets.java:3404
 msgid "Convenience Store"
 msgstr "Міні-маркет"
@@ -31865,10 +31964,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3406
 msgid "Edit Convenience Store"
 msgstr "Властивості Міні-маркету"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3411
 msgid "Kiosk"
 msgstr "Кіоск"
@@ -31876,5 +31975,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3400
+#: build/trans_presets.java:3413
 msgid "Edit Kiosk"
 msgstr "Властивості Кіоску"
@@ -31882,5 +31981,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3419
 msgid "Baker"
 msgstr "Булочна"
@@ -31888,10 +31987,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3421
 msgid "Edit Baker"
 msgstr "Властивості Булочної"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3426
 msgid "Butcher"
 msgstr "М’ясна лавка"
@@ -31899,10 +31998,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3415
+#: build/trans_presets.java:3428
 msgid "Edit Butcher"
 msgstr "Властивості М’ясної лавки"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:3433
 msgid "Seafood"
 msgstr "Морепродукти"
@@ -31910,10 +32009,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3435
 msgid "Edit Seafood"
 msgstr "Властивості Морепродуктів"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3442
 msgid "Deli (Fine Food)"
 msgstr "Делікатеси (Вишукана їжа)"
@@ -31921,10 +32020,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3444
 msgid "Edit Deli (Fine Food)"
 msgstr "Властивості Делікатесів (Вишуканої їжі)"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3451
 msgid "Confectionery"
 msgstr "Кондитерська"
@@ -31932,5 +32031,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3453
 msgid "Edit Confectionery"
 msgstr "Властивості Кондитерської"
@@ -31938,5 +32037,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3459
 msgid "Marketplace"
 msgstr "Ринок"
@@ -31944,10 +32043,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3461
 msgid "Edit Marketplace"
 msgstr "Властивості Ринку"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3468
 msgid "Greengrocer"
 msgstr "Овочевий"
@@ -31955,15 +32054,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:3470
 msgid "Edit Greengrocer"
 msgstr "Властивості Овочевого"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3477
 msgid "Organic"
 msgstr "Екологічно чисті продукти"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3465
+#: build/trans_presets.java:3478
 msgid "Edit Organic Shop"
 msgstr "Властивості Магазину екологічно чистих проуктів"
@@ -31971,5 +32070,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3471
+#: build/trans_presets.java:3484
 msgid "Alcohol"
 msgstr "Алкогольні напої"
@@ -31977,25 +32076,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3486
 msgid "Edit Alcohol Shop"
 msgstr "Властивості Магазину алкогольних напоїв"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3491
 msgid "Beverages"
 msgstr "Напої"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3492
 msgid "Edit Beverages Shop"
 msgstr "Властивості Магазину напоїв"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3487
+#: build/trans_presets.java:3500
 msgid "Edit Clothes Shop"
 msgstr "Властивості Магазину одягу"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3505
 msgid "Boutique"
 msgstr "Бутік"
@@ -32003,20 +32102,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3494
+#: build/trans_presets.java:3507
 msgid "Edit Boutique"
 msgstr "Властивості Бутіку"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3514
 msgid "Shoes"
 msgstr "Взуття"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:3515
 msgid "Edit Shoe Shop"
 msgstr "Властивості Магазину взуття"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3520
 msgid "Outdoor"
 msgstr "Товари для активного відпочинку"
@@ -32024,10 +32123,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3522
 msgid "Edit Outdoor Shop"
 msgstr "Властивості Магазину товарів для активного відпочинку"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3528
 msgid "Edit Sports Shop"
 msgstr "Властивості Магазину спорт-товарів"
@@ -32035,5 +32134,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3534
 msgid "Dry Cleaning"
 msgstr "Хімчистка"
@@ -32041,10 +32140,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3536
 msgid "Edit Dry Cleaning"
 msgstr "Властивості Хімчистки"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3541
 msgid "Laundry"
 msgstr "Пральня"
@@ -32052,20 +32151,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3530
+#: build/trans_presets.java:3543
 msgid "Edit Laundry"
 msgstr "Властивості Пральні"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3548
 msgid "Tailor"
 msgstr "Кравець"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3549
 msgid "Edit Tailor"
 msgstr "Властивості Кравця"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3554
 msgid "Fabric"
 msgstr "Тканини"
@@ -32073,35 +32172,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3556
 msgid "Edit Fabric"
 msgstr "Властивості Тканин"
 
 #. group "Electronic"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3564
 msgid "Electronic"
 msgstr "Електроніка"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:3565
 msgid "Computer"
 msgstr "Комп’ютери"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3566
 msgid "Edit Computer Shop"
 msgstr "Властивості Комп’ютерної крамниці"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:3571
 msgid "Electronics"
 msgstr "Електроніка"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3572
 msgid "Edit Electronics Shop"
 msgstr "Властивості Магазину побутової електроніки"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3577
 msgid "Mobile Phone"
 msgstr "Мобільні телефони"
@@ -32109,10 +32208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3579
 msgid "Edit Mobile Phone"
 msgstr "Властивості Мобільних телефонів"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3586
 msgid "Vacuum Cleaner"
 msgstr "Пилососи"
@@ -32120,35 +32219,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3575
+#: build/trans_presets.java:3588
 msgid "Edit Vacuum Cleaner"
 msgstr "Властивості Пилососів"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:3595
 msgid "Hifi"
 msgstr "Аудіо апаратура"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3596
 msgid "Edit Hifi Shop"
 msgstr "Властивості Магазину Аудіо апаратури"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3601
 msgid "Video"
 msgstr "Відео"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3602
 msgid "Edit Video Shop"
 msgstr "Властивості Магазину відео"
 
 #. group "Cash"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3608
 msgid "Cash"
 msgstr "Гроші"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3609
 msgid "Bank"
 msgstr "Банк"
@@ -32156,5 +32255,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3611
 msgid "Edit Bank"
 msgstr "Властивості Банку"
@@ -32162,10 +32261,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3603 build/trans_presets.java:3612
+#: build/trans_presets.java:3616 build/trans_presets.java:3625
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3605
+#: build/trans_presets.java:3618
 msgid "Money Exchange"
 msgstr "Обмін валют"
@@ -32173,5 +32272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:3620
 msgid "Edit Money Exchange"
 msgstr "Властивості Пункту обміну валют"
@@ -32179,10 +32278,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:3627
 msgid "Edit Automated Teller Machine"
 msgstr "Властивості Банкомату"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:3633
 msgid "Department Store"
 msgstr "Універмаг"
@@ -32190,10 +32289,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3622
+#: build/trans_presets.java:3635
 msgid "Edit Department Store"
 msgstr "Властивості Універмагу"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3629
+#: build/trans_presets.java:3642
 msgid "Mall"
 msgstr "Торговельний центр"
@@ -32201,5 +32300,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3644
 msgid "Edit Mall"
 msgstr "Властивості Торговельного центру"
@@ -32207,35 +32306,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3639
+#: build/trans_presets.java:3652
 msgid "Chemist"
 msgstr "Побутова хімія"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3653
 msgid "Edit Chemist"
 msgstr "Властивості Магазину побутової хімії"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3645
+#: build/trans_presets.java:3658
 msgid "Hairdresser"
 msgstr "Перукарня"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3659
 msgid "Edit Hairdresser"
 msgstr "Властивості Перукарні"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3664
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3665
 msgid "Edit Optician"
 msgstr "Властивості Магазину оптики"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:3670
 msgid "Jewelry"
 msgstr "Ювелірні вироби"
@@ -32243,10 +32342,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3672
 msgid "Edit Jewelry"
 msgstr "Властивості Ювелірних виробів"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3679
 msgid "Erotic"
 msgstr "Секс-шоп"
@@ -32254,5 +32353,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3681
 msgid "Edit Erotic"
 msgstr "Властивості Секс-шопу"
@@ -32260,5 +32359,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3689
 msgid "Florist"
 msgstr "Квітковий магазин"
@@ -32266,10 +32365,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3678
+#: build/trans_presets.java:3691
 msgid "Edit Florist"
 msgstr "Властивості Квіткового магазину"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3696
 msgid "Garden Centre"
 msgstr "Садово-парковий центр"
@@ -32277,5 +32376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3698
 msgid "Edit Garden Centre"
 msgstr "Властивості Магазину садово-паркових товарів"
@@ -32283,5 +32382,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:3704
 msgid "Do-it-yourself-store"
 msgstr "Зроби сам"
@@ -32289,10 +32388,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:3706
 msgid "Edit Do-it-yourself-store"
 msgstr "Властивості Магазину «Зроби сам»"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3711
 msgid "Hardware"
 msgstr "Господарські товари"
@@ -32300,10 +32399,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:3713
 msgid "Edit Hardware Store"
 msgstr "Властивості Магазину господарських товарів"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:3718
 msgid "Paint"
 msgstr "Малярні аксесуари"
@@ -32311,5 +32410,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3707
+#: build/trans_presets.java:3720
 msgid "Edit Paint"
 msgstr "Властивості Малярних аксесуарів"
@@ -32317,15 +32416,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3715
+#: build/trans_presets.java:3728
 msgid "Furniture"
 msgstr "Меблі"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3716
+#: build/trans_presets.java:3729
 msgid "Edit Furniture Shop"
 msgstr "Властивості Меблевого магазину"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3721
+#: build/trans_presets.java:3734
 msgid "Kitchen"
 msgstr "Все для кухні"
@@ -32333,10 +32432,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3723
+#: build/trans_presets.java:3736
 msgid "Edit Kitchen"
 msgstr "Властивості Все для кухні"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3730
+#: build/trans_presets.java:3743
 msgid "Curtain"
 msgstr "Штори та гардини"
@@ -32344,10 +32443,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3745
 msgid "Edit Curtain"
 msgstr "Властивості Штор та гардин"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3752
 msgid "Frame"
 msgstr "Рами"
@@ -32355,5 +32454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3754
 msgid "Edit Frames"
 msgstr "Властивості Рам"
@@ -32361,15 +32460,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3762
 msgid "Stationery"
 msgstr "Канцтовари"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:3763
 msgid "Edit Stationery Shop"
 msgstr "Властивості Магазину канцтоварів"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3768
 msgid "Copyshop"
 msgstr "Копіювання"
@@ -32377,15 +32476,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3757
+#: build/trans_presets.java:3770
 msgid "Edit Copyshop"
 msgstr "Властивості Копіювальних послуг"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3764
+#: build/trans_presets.java:3777
 msgid "Book Store"
 msgstr "Книжковий магазин"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3765
+#: build/trans_presets.java:3778
 msgid "Edit Book Store"
 msgstr "Властивості Книжкового магазину"
@@ -32393,15 +32492,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3771
+#: build/trans_presets.java:3784
 msgid "Travel Agency"
 msgstr "Турагентство"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3785
 msgid "Edit Travel Agency"
 msgstr "Властивості Турагентства"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3790
 msgid "Musical Instrument"
 msgstr "Музичні інструменти"
@@ -32409,20 +32508,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3779
+#: build/trans_presets.java:3792
 msgid "Edit Musical Instruments"
 msgstr "Властивості Музичних інструментів"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3786
+#: build/trans_presets.java:3799
 msgid "Toys"
 msgstr "Іграшки"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3787
+#: build/trans_presets.java:3800
 msgid "Edit Toy Shop"
 msgstr "Властивості Магазину іграшок"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:3805
 msgid "Variety Store"
 msgstr "Універсам"
@@ -32430,10 +32529,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:3807
 msgid "Edit Variety Store"
 msgstr "Властивості Універсаму"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3802
+#: build/trans_presets.java:3815
 msgid "Vending machine"
 msgstr "Торговий автомат"
@@ -32441,5 +32540,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3817
 msgid "Edit Vending machine"
 msgstr "Властивості Торгового автомата"
@@ -32447,180 +32546,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "Vending products"
 msgstr "Товар"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_tickets"
 msgstr "квитки на громадський транспорт"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_plans"
 msgstr "схеми громадського транспорту"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "parking_tickets"
 msgstr "талони на паркування"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "food"
 msgstr "продукти харчування"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "drinks"
 msgstr "напої"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "sweets"
 msgstr "солодощі"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "cigarettes"
 msgstr "сигарети"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "photos"
 msgstr "фотографії"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "animal_food"
 msgstr "їжа для тварин"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "news_papers"
 msgstr "газети"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "toys"
 msgstr "іграшки"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "stamps"
 msgstr "марки"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "telephone_vouchers"
 msgstr "телефонні картки"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "vouchers"
 msgstr "ваучери"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "bicycle_tube"
 msgstr "вело шини"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "condoms"
 msgstr "презервативи"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "tampons"
 msgstr "тампони"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "excrement_bags"
 msgstr "пакети для екскрементів"
 
 #. group "Geography"
-#: build/trans_presets.java:3818 build/trans_presets.java:3942
+#: build/trans_presets.java:3831 build/trans_presets.java:3955
 msgid "Geography"
 msgstr "Географія"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3832
 msgid "Boundaries"
 msgstr "Кордони"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3833
 msgid "National"
 msgstr "Державний"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3821
+#: build/trans_presets.java:3834
 msgid "Edit National Boundary"
 msgstr "Властивості Державного кордону"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:3839
 msgid "Administrative"
 msgstr "Адміністративний"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:3840
 msgid "Edit Administrative Boundary"
 msgstr "Властивості Адміністративного кордону"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3845
 msgid "Civil"
 msgstr "Громад"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3846
 msgid "Edit Civil Boundary"
 msgstr "Властивості Меж громад"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:3851
 msgid "Political"
 msgstr "Політичні"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3852
 msgid "Edit Political Boundary"
 msgstr "Властивості політичного кордону"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:3857
 msgid "National park"
 msgstr "Національний парк"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3858
 msgid "Edit National Park Boundary"
 msgstr "Властивості Кордону національного парку"
 
 #. group "Places"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3864
 msgid "Places"
 msgstr "Місця"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3865
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3853
+#: build/trans_presets.java:3866
 msgid "Edit Continent"
 msgstr "Властивості Континенту"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:3872
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -32628,10 +32727,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3860
+#: build/trans_presets.java:3873
 msgid "Edit Country"
 msgstr "Властивості Країни"
 
 #. item "Places/State"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3879
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -32639,25 +32738,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3867
+#: build/trans_presets.java:3880
 msgid "Edit State"
 msgstr "Властивості Штату"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3886
 msgid "Region"
 msgstr "Область"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3887
 msgid "Edit Region"
 msgstr "Властивості Області"
 
 #. item "Places/County"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3893
 msgid "County"
 msgstr "Район"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:3894
 msgid "Edit County"
 msgstr "Властивості Району"
@@ -32665,5 +32764,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3888
+#: build/trans_presets.java:3901
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -32672,10 +32771,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:3902
 msgid "Edit City"
 msgstr "Властивості Міста"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:3908
 msgid "Town"
 msgstr "Місто"
@@ -32683,10 +32782,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3897
+#: build/trans_presets.java:3910
 msgid "Edit Town"
 msgstr "Властивості Селища"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:3916
 msgid "Suburb"
 msgstr "Передмістя"
@@ -32694,42 +32793,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3905
+#: build/trans_presets.java:3918
 msgid "Edit Suburb"
 msgstr "Властивості Передмістя"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3911
+#: build/trans_presets.java:3924
 msgid "Village"
 msgstr "Село"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3912
+#: build/trans_presets.java:3925
 msgid "Edit Village"
 msgstr "Властивості Села"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3931
 msgid "Hamlet"
 msgstr "Хутір"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3919
+#: build/trans_presets.java:3932
 msgid "Edit Hamlet"
 msgstr "Властивості Хутора"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3938
 msgid "Isolated Dwelling"
-msgstr ""
+msgstr "Ізольоване житло"
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3926
-#, fuzzy
+#: build/trans_presets.java:3939
 msgid "Edit Isolated Dwelling"
-msgstr "Властивості Колодязю"
+msgstr "Властивості ізольованого житла"
 
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:3946
 msgid "Locality"
 msgstr "Місцевість"
@@ -32737,10 +32835,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3935
+#: build/trans_presets.java:3948
 msgid "Edit Locality"
 msgstr "Властивості Місцевості"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:3956
 msgid "Peak"
 msgstr "Вершина"
@@ -32748,10 +32846,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3945
+#: build/trans_presets.java:3958
 msgid "Edit Peak"
 msgstr "Властивості Вершини"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:3964
 msgid "Glacier"
 msgstr "Льодовик"
@@ -32759,10 +32857,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:3966
 msgid "Edit Glacier"
 msgstr "Властивості Льодовика"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:3972
 msgid "Volcano"
 msgstr "Вулкан"
@@ -32770,10 +32868,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3961
+#: build/trans_presets.java:3974
 msgid "Edit Volcano"
 msgstr "Властивості Вулкану"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3967
+#: build/trans_presets.java:3980
 msgid "Cave Entrance"
 msgstr "Вхід до печери"
@@ -32781,5 +32879,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3969
+#: build/trans_presets.java:3982
 msgid "Edit Cave Entrance"
 msgstr "Властивості Входу до печери"
@@ -32787,5 +32885,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3975
+#: build/trans_presets.java:3988
 msgid "Island"
 msgstr "Острів"
@@ -32793,10 +32891,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:3990
 msgid "Edit Island"
 msgstr "Властивості Острова"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:3996
 msgid "Islet"
 msgstr "Острівець"
@@ -32804,15 +32902,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:3998
 msgid "Edit Islet"
 msgstr "Властивості Острівця"
 
 #. group "Nature"
-#: build/trans_presets.java:3992
+#: build/trans_presets.java:4005
 msgid "Nature"
 msgstr "Природа"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3993
+#: build/trans_presets.java:4006
 msgid "Tree"
 msgstr "Дерево"
@@ -32821,15 +32919,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:4009
 msgid "Edit Tree"
 msgstr "Властивості Дерева"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4014
 msgid "Botanical Name"
 msgstr "Ботанічна назва"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4003
+#: build/trans_presets.java:4016
 msgid "Wood"
 msgstr "Дерева"
@@ -32838,10 +32936,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4019
 msgid "Edit Wood"
 msgstr "Властивості Дерев"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "coniferous"
@@ -32849,5 +32947,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "deciduous"
@@ -32855,5 +32953,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "mixed"
@@ -32861,5 +32959,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4011
+#: build/trans_presets.java:4024
 msgid "Forest"
 msgstr "Лісовий масив"
@@ -32868,30 +32966,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4027
 msgid "Edit Forest Landuse"
 msgstr "Властивості Лісового масиву"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "coniferous"
 msgstr "хвойний"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "deciduous"
 msgstr "листяний"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "mixed"
 msgstr "мішаний"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4020
+#: build/trans_presets.java:4033
 msgid "Nature Reserve"
 msgstr "Заповідник"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4034
 msgid "Edit Nature Reserve"
 msgstr "Властивості Заповідника"
@@ -32899,15 +32997,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:4039
 msgid "Scree"
 msgstr "Осип"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4040
 msgid "Edit Scree"
 msgstr "Властивості Осипи"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4044
 msgid "Fell"
 msgstr "Кам’яниста земля"
@@ -32915,20 +33013,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4046
 msgid "Edit Fell"
 msgstr "Властивості Кам’янистої землі"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4037
+#: build/trans_presets.java:4050
 msgid "Scrub"
 msgstr "Чагарник"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4038
+#: build/trans_presets.java:4051
 msgid "Edit Scrub"
 msgstr "Властивості Чагарнику"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4042
+#: build/trans_presets.java:4055
 msgid "Heath"
 msgstr "Пустир"
@@ -32936,15 +33034,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4057
 msgid "Edit Heath"
 msgstr "Властивості Пустиря"
 
 #. group "Land use"
-#: build/trans_presets.java:4049
+#: build/trans_presets.java:4062
 msgid "Land use"
 msgstr "Землекористування"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4063
 msgid "Farmyard"
 msgstr "Двір ферми"
@@ -32953,40 +33051,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4066
 msgid "Edit Farmyard Landuse"
 msgstr "Властивості Двору ферми"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4058
+#: build/trans_presets.java:4071
 msgid "Farmland"
 msgstr "Сільськогосподарські угіддя"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4059
+#: build/trans_presets.java:4072
 msgid "Edit Farmland Landuse"
 msgstr "Властивості Сільськогосподарських угідь"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4077
 msgid "Meadow"
 msgstr "Левада"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4065
+#: build/trans_presets.java:4078
 msgid "Edit Meadow Landuse"
 msgstr "Властивості Левади"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4083
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4084
 msgid "Edit Vineyard Landuse"
 msgstr "Властивості Виноградників"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4076
+#: build/trans_presets.java:4089
 msgid "Greenhouse Horticulture"
 msgstr "Теплиця"
@@ -32994,15 +33092,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4091
 msgid "Edit Greenhouse Horticulture"
 msgstr "Властивості Теплиці"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4097
 msgid "Allotments"
 msgstr "Горо́д"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:4098
 msgid "Edit Allotments Landuse"
 msgstr "Властивості Го́родів"
@@ -33010,25 +33108,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4104
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4105
 msgid "Edit Garden"
 msgstr "Властивості Садів"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4109
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4110
 msgid "Edit Grass Landuse"
 msgstr "Властивості Газону"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4102
+#: build/trans_presets.java:4115
 msgid "Village Green"
 msgstr "Сільський майдан"
@@ -33036,10 +33134,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4117
 msgid "Edit Village Green Landuse"
 msgstr "Властивості Сільського майдану"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4122
 msgid "Common"
 msgstr "Землі місцевої громади"
@@ -33047,20 +33145,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4111
+#: build/trans_presets.java:4124
 msgid "Edit Common"
 msgstr "Властивості Земель місцевої громади"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4128
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4116
+#: build/trans_presets.java:4129
 msgid "Edit Park"
 msgstr "Властивості Парку"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4133
 msgid "Recreation Ground"
 msgstr "Майданчик для ігор"
@@ -33068,5 +33166,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4135
 msgid "Edit Recreation Ground Landuse"
 msgstr "Властивості Майданчику для ігор"
@@ -33074,15 +33172,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4141
 msgid "Residential area"
 msgstr "Житлова зона"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4142
 msgid "Edit Residential Landuse"
 msgstr "Властивості Житлової зони"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4147
 msgid "Graveyard"
 msgstr "Цвинтар"
@@ -33090,10 +33188,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4136
+#: build/trans_presets.java:4149
 msgid "Edit Graveyard"
 msgstr "Властивості Цвинтаря"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4155
 msgid "Cemetery"
 msgstr "Кладовище"
@@ -33101,40 +33199,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4157
 msgid "Edit Cemetery Landuse"
 msgstr "Властивості Кладовища"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4151
+#: build/trans_presets.java:4164
 msgid "Retail"
 msgstr "Роздрібна торгівля"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4152
+#: build/trans_presets.java:4165
 msgid "Edit Retail Landuse"
 msgstr "Властивості Зони роздрібної торгівлі"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4170
 msgid "Commercial"
 msgstr "Діловий район"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4158
+#: build/trans_presets.java:4171
 msgid "Edit Commercial Landuse"
 msgstr "Властивості Ділового району"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4176
 msgid "Industrial"
 msgstr "Промзона"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4177
 msgid "Edit Industrial Landuse"
 msgstr "Властивості Промзони"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4182
 msgid "Garages"
 msgstr "Гражі"
@@ -33142,10 +33240,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4184
 msgid "Edit Garages"
 msgstr "Властивості Гаражів"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4190
 msgid "Railway land"
 msgstr "Територія залізниці"
@@ -33153,15 +33251,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4192
 msgid "Edit Railway Landuse"
 msgstr "Властивості Території залізниці"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4197
 msgid "Military"
 msgstr "Військова зона"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4185
+#: build/trans_presets.java:4198
 msgid "Edit Military Landuse"
 msgstr "Властивості Військової зони"
@@ -33169,55 +33267,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4191
+#: build/trans_presets.java:4204
 msgid "Construction area"
 msgstr "Будівельний майданчик"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4205
 msgid "Edit Construction Landuse"
 msgstr "Властивості Будівельного майданчику"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4210
 msgid "Brownfield"
 msgstr "Очищене місце під забудову"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4211
 msgid "Edit Brownfield Landuse"
 msgstr "Властивості Очищеного місця під забудову"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4203
+#: build/trans_presets.java:4216
 msgid "Greenfield"
 msgstr "Ділянка під нову забудову"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4217
 msgid "Edit Greenfield Landuse"
 msgstr "Властивості Ділянки під нову забудову"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4209
+#: build/trans_presets.java:4222
 msgid "Landfill"
 msgstr "Звалище"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4223
 msgid "Edit Landfill Landuse"
 msgstr "Властивості Звалища"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4215
+#: build/trans_presets.java:4228
 msgid "Quarry"
 msgstr "Кар’єр"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4229
 msgid "Edit Quarry Landuse"
 msgstr "Властивості Кар’єра"
 
 #. group "Annotation"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4236
 msgid "Annotation"
 msgstr "Вказівники"
@@ -33225,5 +33323,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4224
+#: build/trans_presets.java:4237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -33234,5 +33332,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4227
+#: build/trans_presets.java:4240
 msgid "Edit Address Information"
 msgstr "Властивості Адреси"
@@ -33240,5 +33338,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4242
 msgid "House number"
 msgstr "Номер будинку"
@@ -33246,5 +33344,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4231
+#: build/trans_presets.java:4244
 msgid "House name"
 msgstr "Назва будинку"
@@ -33253,55 +33351,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4232 build/trans_presets.java:4386
+#: build/trans_presets.java:4245 build/trans_presets.java:4399
 msgid "Street name"
 msgstr "Вулиця"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4233
+#: build/trans_presets.java:4246
 msgid "City name"
 msgstr "Назва міста"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4234
+#: build/trans_presets.java:4247
 msgid "Post code"
 msgstr "Поштовий індекс"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "Country code"
 msgstr "Код країни"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "AT"
 msgstr "AT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "CH"
 msgstr "CH"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "DE"
 msgstr "DE"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "FR"
 msgstr "FR"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "GB"
 msgstr "GB"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "IT"
 msgstr "IT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "US"
 msgstr "US"
@@ -33309,5 +33407,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4238
+#: build/trans_presets.java:4251
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -33319,5 +33417,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4241
+#: build/trans_presets.java:4254
 msgid "Edit Address Interpolation"
 msgstr "Властивості Вставки адрес"
@@ -33325,35 +33423,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "Numbering scheme"
 msgstr "Схема нумерації"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "odd"
 msgstr "непарні"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "even"
 msgstr "парні"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "alphabetic"
 msgstr "за абеткою"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4245
+#: build/trans_presets.java:4258
 msgid "Contact"
 msgstr "Контактна інформація"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4259
 msgid "Edit Contact information"
 msgstr "Властивості контактної інформації"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4255
+#: build/trans_presets.java:4268
 msgid "Image"
 msgstr "Зображення"
@@ -33363,5 +33461,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4263
+#: build/trans_presets.java:4276
 msgid "Edit Multipolygon"
 msgstr "Властивості Мультиполігону"
@@ -33373,5 +33471,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4269 build/trans_presets.java:4286
+#: build/trans_presets.java:4282 build/trans_presets.java:4299
 msgid "outer segment"
 msgstr "зовнішній сегмент"
@@ -33379,5 +33477,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4270 build/trans_presets.java:4287
+#: build/trans_presets.java:4283 build/trans_presets.java:4300
 msgid "inner segment"
 msgstr "внутрішній сегмент"
@@ -33385,5 +33483,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4273
+#: build/trans_presets.java:4286
 msgid "Boundary"
 msgstr "Кордони"
@@ -33394,5 +33492,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4278
+#: build/trans_presets.java:4291
 msgid "Edit Boundary"
 msgstr "Властивості Кордонів"
@@ -33400,40 +33498,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "Boundary type"
 msgstr "Тип Кордону"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "administrative"
 msgstr "адміністративний"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "national"
 msgstr "національний"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "civil"
 msgstr "громади"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "political"
 msgstr "політичний"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4283
+#: build/trans_presets.java:4296
 msgid "Administrative level"
 msgstr "Адміністративний рівень"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4288
+#: build/trans_presets.java:4301
 msgid "Sub area"
 msgstr "Підпорядкована територія"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4289
+#: build/trans_presets.java:4302
 msgid "Administration centre"
 msgstr "Адміністративний центр"
@@ -33441,5 +33539,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4292
+#: build/trans_presets.java:4305
 msgid "Turn restriction"
 msgstr "Обмеження на поворот"
@@ -33448,5 +33546,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4308
 msgid "Edit Turn Restriction"
 msgstr "Властивості Обмеження на поворот"
@@ -33454,40 +33552,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "Restriction"
 msgstr "Обмеження"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_left_turn"
 msgstr "поворот ліворуч заборонений"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_right_turn"
 msgstr "поворот праворуч заборонений"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_straight_on"
 msgstr "проїзд заборонений"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_u_turn"
 msgstr "розворот заборонений"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_right_turn"
 msgstr "тільки праворуч"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_left_turn"
 msgstr "тільки ліворуч"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_straight_on"
 msgstr "тільки прямо"
@@ -33496,16 +33594,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4315
 msgid "from way"
 msgstr "з"
 
 #. item "Relations/Turn restriction" role "via node or ways"
-#: build/trans_presets.java:4303
-#, fuzzy
+#: build/trans_presets.java:4316
 msgid "via node or ways"
-msgstr "через точку або лінію"
+msgstr "точка або лінія \"via\""
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4304
+#: build/trans_presets.java:4317
 msgid "to way"
 msgstr "до"
@@ -33513,5 +33610,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4307
+#: build/trans_presets.java:4320
 msgid "Route"
 msgstr "Маршрут"
@@ -33525,5 +33622,5 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4328
 msgid "Edit Route"
 msgstr "Властивості маршруту"
@@ -33533,5 +33630,5 @@
 #. <key key="type" value="route" />
 #. item "Relations/Directional Route (North America)" combo "Route type"
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "Route type"
 msgstr "Тип маршруту"
@@ -33539,5 +33636,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -33547,5 +33644,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "road"
 msgstr "дорога"
@@ -33553,5 +33650,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ferry"
 msgstr "поромний"
@@ -33559,5 +33656,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ski"
 msgstr "лижний"
@@ -33610,5 +33707,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:199 build/trans_style.java:531
 #: build/trans_style.java:537 build/trans_style.java:557
@@ -33620,5 +33717,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "hiking"
 msgstr "пішохідна екскурсія"
@@ -33626,5 +33723,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -33634,5 +33731,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "detour"
 msgstr "об’їзд"
@@ -33646,5 +33743,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
@@ -33655,5 +33752,5 @@
 #. item "Relations/Route" text "Symbol description"
 #. item "Relations/Directional Route (North America)" text "Symbol description"
-#: build/trans_presets.java:4320 build/trans_presets.java:4350
+#: build/trans_presets.java:4333 build/trans_presets.java:4363
 msgid "Symbol description"
 msgstr "Опис символів"
@@ -33665,6 +33762,6 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4323 build/trans_presets.java:4353
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4336 build/trans_presets.java:4366
+#: build/trans_presets.java:4388
 msgid "Network"
 msgstr "Мережа"
@@ -33672,5 +33769,5 @@
 #. item "Relations/Route" combo "Route state"
 #. item "Relations/Directional Route (North America)" combo "Route state"
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "Route state"
 msgstr "Стан маршруту"
@@ -33678,5 +33775,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "proposed"
 msgstr "планований"
@@ -33684,5 +33781,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "alternate"
 msgstr "альтернативний"
@@ -33690,5 +33787,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "temporary"
 msgstr "тимчасовий"
@@ -33696,5 +33793,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "connection"
 msgstr "з’єднуючий"
@@ -33702,5 +33799,5 @@
 #. item "Relations/Route" text "Color (hex)"
 #. item "Relations/Directional Route (North America)" text "Color (hex)"
-#: build/trans_presets.java:4326 build/trans_presets.java:4356
+#: build/trans_presets.java:4339 build/trans_presets.java:4369
 msgid "Color (hex)"
 msgstr "Колір (hex)"
@@ -33712,15 +33809,15 @@
 #. <roles>
 #. item "Relations/Directional Route (North America)" role "route segment"
-#: build/trans_presets.java:4329 build/trans_presets.java:4359
+#: build/trans_presets.java:4342 build/trans_presets.java:4372
 msgid "route segment"
 msgstr "відрізок маршруту"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4330
+#: build/trans_presets.java:4343
 msgid "forward segment"
 msgstr "наступний відрізок"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4331
+#: build/trans_presets.java:4344
 msgid "backward segment"
 msgstr "попередній відрізок"
@@ -33728,5 +33825,5 @@
 #. item "Relations/Route" role "halt point"
 #. item "Relations/Directional Route (North America)" role "halt point"
-#: build/trans_presets.java:4332 build/trans_presets.java:4364
+#: build/trans_presets.java:4345 build/trans_presets.java:4377
 msgid "halt point"
 msgstr "кінцева точка"
@@ -33734,5 +33831,5 @@
 #. item "Relations/Route" role "forward halt point"
 #. item "Relations/Directional Route (North America)" role "forward halt point"
-#: build/trans_presets.java:4333 build/trans_presets.java:4365
+#: build/trans_presets.java:4346 build/trans_presets.java:4378
 msgid "forward halt point"
 msgstr "наступна кінцева точка"
@@ -33740,5 +33837,5 @@
 #. item "Relations/Route" role "backward halt point"
 #. item "Relations/Directional Route (North America)" role "backward halt point"
-#: build/trans_presets.java:4334 build/trans_presets.java:4366
+#: build/trans_presets.java:4347 build/trans_presets.java:4379
 msgid "backward halt point"
 msgstr "попередня кінцева точка"
@@ -33746,7 +33843,7 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4337
+#: build/trans_presets.java:4350
 msgid "Directional Route (North America)"
-msgstr ""
+msgstr "Спрямований маршрут (Півн. Америка)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
@@ -33758,35 +33855,31 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
-#: build/trans_presets.java:4345
+#: build/trans_presets.java:4358
 msgid "Edit Directional Route (used in North America)"
-msgstr ""
+msgstr "Властивості спрямованого маршруту (Півн. Америка)"
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4360
-#, fuzzy
+#: build/trans_presets.java:4373
 msgid "east segment"
-msgstr "зовнішній сегмент"
+msgstr "східний відрізок"
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4361
-#, fuzzy
+#: build/trans_presets.java:4374
 msgid "north segment"
-msgstr "зовнішній сегмент"
+msgstr "північний відрізок"
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4362
-#, fuzzy
+#: build/trans_presets.java:4375
 msgid "west segment"
-msgstr "зовнішній сегмент"
+msgstr "західний відрізок"
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4363
-#, fuzzy
+#: build/trans_presets.java:4376
 msgid "south segment"
-msgstr "зовнішній сегмент"
+msgstr "південний відрізок"
 
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4369
+#: build/trans_presets.java:4382
 msgid "Route network"
 msgstr "Маршрутна мережа"
@@ -33794,5 +33887,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4371
+#: build/trans_presets.java:4384
 msgid "Edit route network"
 msgstr "Властивості маршрутної мережі"
@@ -33801,5 +33894,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4379
+#: build/trans_presets.java:4392
 msgid "member"
 msgstr "член"
@@ -33807,5 +33900,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4395
 msgid "Associated street"
 msgstr "Зв’язана вулиця"
@@ -33813,10 +33906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4384
+#: build/trans_presets.java:4397
 msgid "Edit associated street"
 msgstr "Властивості зв’язаної вулиці"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4389
+#: build/trans_presets.java:4402
 msgid "house"
 msgstr "будинок"
@@ -37293,26 +37386,23 @@
 msgstr "максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
 
-#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
-#: build/trans_validator.java:70
-msgid "oneway combined with *:backward/forward"
-msgstr "oneway скомбіновано з *:backward/forward"
-
+#. see #5844, #6760
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:72
+#: build/trans_validator.java:73
 msgid "layer tag with + sign"
 msgstr "теґ layer зі знаком +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:74
+#: build/trans_validator.java:75
 msgid "street name contains ss"
 msgstr "назва вулиці містить ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:76
+#: build/trans_validator.java:77
 msgid "relation without type"
 msgstr "зв’язок без типу"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "restaurant without name"
 msgstr "ресторан без імені"
@@ -37321,236 +37411,548 @@
 #. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:81
+#: build/trans_validator.java:82
 msgid "unusual tag combination (highway & waterway)"
 msgstr "незвичайна комбінація теґів (highway & waterway)"
 
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:82
+#: build/trans_validator.java:83
 msgid "unusual tag combination (highway & natural)"
 msgstr "незвичайна комбінація теґів (highway & natural)"
 
-#. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
-#. http://irs.gis-lab.info/?layers=landsat&
-#: build/trans_wms.java:2
+#. <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+#. <imagery>
+#. <!--true;Landsat;http://irs.gis-lab.info/?layers=landsat&-->
+#. <entry>
+#. <name>Landsat</name>
+#: build/trans_wms.java:5
 msgid "Landsat"
 msgstr "Тло Landsat"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#: build/trans_wms.java:3
+#. <type>wms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. </entry>
+#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>Open Aerial Map</name>
+#: build/trans_wms.java:12
 msgid "Open Aerial Map"
 msgstr "Тло Open Aerial Map"
 
-#. bing:bing
-#: build/trans_wms.java:4
+#. <type>wms</type>
+#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
+#. </entry>
+#. <!--different forms for web access-->
+#. <!--true;Bing Sat;bing:bing-->
+#. <entry>
+#. <name>Bing Sat</name>
+#: build/trans_wms.java:19
 msgid "Bing Sat"
 msgstr "Знімки Bing"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
-#: build/trans_wms.java:5
+#. <type>bing</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://www.bing.com/maps/</url>
+#. <default>true</default>
+#. </entry>
+#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
+#. <entry>
+#. <name>Yahoo Sat</name>
+#: build/trans_wms.java:27
 msgid "Yahoo Sat"
 msgstr "Тло Yahoo Sat"
 
-#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png
-#: build/trans_wms.java:6
+#. <type>html</type>
+#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
+#. </entry>
+#. <!--Tile based access-->
+#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#. <entry>
+#. <name>MapQuest Open Aerial</name>
+#: build/trans_wms.java:34
 msgid "MapQuest Open Aerial"
 msgstr "MapQuest Open Aerial"
 
-#. tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm
-#: build/trans_wms.java:7
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png]]></url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik);tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm-->
+#. <entry>
+#. <namUse of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. e>OpenStreetMap (Mapnik)</name>
+#: build/trans_wms.java:42
 msgid "OpenStreetMap (Mapnik)"
 msgstr "OpenStreetMap (Mapnik)"
 
-#. tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:8
-msgid "OpenStreetMap (Mapnik B&W)"
-msgstr "OpenStreetMap (Mapnik Ч&Б)"
-
-#. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
-#: build/trans_wms.java:9
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenCycleMap</name>
+#: build/trans_wms.java:62
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm
-#: build/trans_wms.java:10
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#. <entry>
+#. <name>TilesAtHome</name>
+#: build/trans_wms.java:71
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm
-#: build/trans_wms.java:11
+#. <type>tms</type>
+#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#. <entry>
+#. <name>MapQuest OSM</name>
+#: build/trans_wms.java:80
 msgid "MapQuest OSM"
 msgstr "MapQuest OSM"
 
-#. tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm
-#: build/trans_wms.java:12
+#. <type>tms</type>
+#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
+#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#. <entry>
+#. <name>ODBL coverage</name>
+#: build/trans_wms.java:90
 msgid "ODBL coverage"
 msgstr "Покриття ODBL"
 
-#. tms[18]:http://tile.xn--pnvkarte-m4a.de/tilegen;;;osm;osm;osm
-#: build/trans_wms.java:13
-msgid "PNV"
-msgstr "PNV (tile.öpnvkarte.de)"
-
-#. tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:14
+#. <type>tms</type>
+#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--only for Europe-->
+#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#. <entry>
+#. <name>ÖPNV</name>
+#: build/trans_wms.java:101
+msgid "ÖPNV"
+msgstr "ÖPNV"
+
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--false;German Style;tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>German Style</name>
+#: build/trans_wms.java:111
 msgid "German Style"
 msgstr "Німецький стиль"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#: build/trans_wms.java:15
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--only for Germany-->
+#. <!--false;Streets NRW Geofabrik.de;http:/Use of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. /tools.geofabrik.de/osmi/view/strassennrw/josmwms?-->
+#. <entry>
+#. <name>Streets NRW Geofabrik.de</name>
+#: build/trans_wms.java:123
 msgid "Streets NRW Geofabrik.de"
 msgstr "Вулиці NRW Geofabrik.de"
 
-#. tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm
-#: build/trans_wms.java:16
-msgid "Hike & Bike"
-msgstr "Походи та вело-подорожі"
-
-#. tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm
-#: build/trans_wms.java:17
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Sorbische Karte;tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm-->
+#. <entry>
+#. <name>Sorbische Karte</name>
+#: build/trans_wms.java:140
 msgid "Sorbische Karte"
 msgstr "Мапа Сербії"
 
-#. tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm
-#: build/trans_wms.java:18
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Deutsche Karte;tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm-->
+#. <entry>
+#. <name>Deutsche Karte</name>
+#: build/trans_wms.java:150
 msgid "Deutsche Karte"
 msgstr "Мапа Німеччини"
 
-#. tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm
-#: build/trans_wms.java:19
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;OpenPT Map;tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm-->
+#. <entry>
+#. <name>OpenPT Map</name>
+#: build/trans_wms.java:160
 msgid "OpenPT Map"
 msgstr "Мапа OpenPT"
 
-#. wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&
-#: build/trans_wms.java:20
+#. <type>tms</type>
+#. <url><![CDATA[http://openptmap.de/tiles/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>16</max-zoom>
+#. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Bayern (2m);wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&-->
+#. <entry>
+#. <name>Bayern (2m)</name>
+#: build/trans_wms.java:172
 msgid "Bayern (2m)"
 msgstr "Баварія (2m)"
 
-#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
-#: build/trans_wms.java:21
+#. <type>wms</type>
+#. <url><![CDATA[http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--only for Austria-->
+#. <!--false;Geoimage.at;http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&-->
+#. <entry>
+#. <name>Geoimage.at</name>
+#: build/trans_wms.java:180
 msgid "Geoimage.at"
 msgstr "Geoimage.at"
 
-#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
-#: build/trans_wms.java:22
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&]]></url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--false;Geoimage.at (HighRes);wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste-->
+#. <entry>
+#. <name>Geoimage.at (HighRes)</name>
+#: build/trans_wms.java:187
 msgid "Geoimage.at (HighRes)"
 msgstr "Geoimage.at (HighRes)"
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#. <type>wms</type>
+#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&]]></url>
+#. <bounds min-lat='9.35676' min-lon='46.0872' max-lat='17.3099' max-lon='49.2092'/>
+#. <attribution-text mandatory='true'>geoimage.at</attribution-text>
+#. <terms-of-use-url>http://www.geoimage.at/geoimage/geodatendienste</terms-of-use-url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--only for North America-->
+#. <!--Terraserver USCG - High resolution maps-->
+#. <!--false;MSR Maps Topo;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Topo</name>
+#: build/trans_wms.java:199
 msgid "MSR Maps Topo"
 msgstr "Топографічні мапи MSR"
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:24
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--false;MSR Maps Urban;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Urban</name>
+#: build/trans_wms.java:206
 msgid "MSR Maps Urban"
 msgstr "Міські мапи MSR"
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:25
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--only for Czech Republic-->
+#. <!--false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&-->
+#. <entry>
+#. <name>Czech CUZK:KM</name>
+#: build/trans_wms.java:214
 msgid "Czech CUZK:KM"
 msgstr "Чехія CUZK:KM"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:26
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Czech UHUL:ORTOFOTO</name>
+#: build/trans_wms.java:221
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Чехія UHUL:ORTOFOTO"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:27
+#. <type>wms</type>
+#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--only for GB-->
+#. <!--false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&-->
+#. <entry>
+#. <name>NPE Maps</name>
+#: build/trans_wms.java:229
 msgid "NPE Maps"
 msgstr "Мапи NPE"
 
-#. http://timsc.dev.openstreetmap.org/wms2/map.php?
-#: build/trans_wms.java:28
+#. <type>wms</type>
+#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
+#. <entry>
+#. <name>NPE Maps (Tim)</name>
+#: build/trans_wms.java:236
 msgid "NPE Maps (Tim)"
 msgstr "Мапи NPE (Tim)"
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:29
+#. <type>wms</type>
+#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
+#. <entry>
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:243
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#. <type>wms</type>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--only for Japan-->
+#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO)</name>
+#: build/trans_wms.java:251
 msgid "MLIT Japan (ORTHO)"
 msgstr "Японія MLIT (ORTHO)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO01)</name>
+#: build/trans_wms.java:258
 msgid "MLIT Japan (ORTHO01)"
 msgstr "Японія MLIT (ORTHO01)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO02)</name>
+#: build/trans_wms.java:265
 msgid "MLIT Japan (ORTHO02)"
 msgstr "Японія MLIT (ORTHO02)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:33
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO03)</name>
+#: build/trans_wms.java:272
 msgid "MLIT Japan (ORTHO03)"
 msgstr "Японія MLIT (ORTHO03)"
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:34
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--only for Italy-->
+#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Lodi - Italy</name>
+#: build/trans_wms.java:280
 msgid "Lodi - Italy"
 msgstr "Італия – Лоді"
 
-#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:35
+#. <type>wms</type>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Sicily - Italy</name>
+#: build/trans_wms.java:287
 msgid "Sicily - Italy"
 msgstr "Італія – Сицилія"
 
-#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:36
+#. <type>wms</type>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#. <entry>
+#. <name>PCN 2006 - Italy</name>
+#: build/trans_wms.java:294
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 — Італія"
 
-#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:37
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--only for France-->
+#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#. <entry>
+#. <name>SPOTMaps (France)</name>
+#: build/trans_wms.java:302
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Франція)"
 
-#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:38
+#. <type>wms</type>
+#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
+#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <!--only for Spain-->
+#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#. <entry>
+#. <name>PNOA Spain</name>
+#: build/trans_wms.java:311
 msgid "PNOA Spain"
 msgstr "PNOA Spain (Іспанія)"
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:39
+#. <type>wms</type>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <country-code>ES</country-code>
+#. </entry>
+#. <!--only for Estonia-->
+#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#. <entry>
+#. <name>Estonia Basemap (Maaamet)</name>
+#: build/trans_wms.java:320
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Основна мапа Естонії (Maaamet)"
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:40
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Estonia Ortho (Maaamet)</name>
+#: build/trans_wms.java:327
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Орто мапа Естонії (Maaamet)"
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:41
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#. <entry>
+#. <name>Estonia Multi (Maaamet)</name>
+#: build/trans_wms.java:334
 msgid "Estonia Multi (Maaamet)"
 msgstr "Мулти мапа Естонії (Maaamet)"
 
-#. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:42
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--only for Denmark-->
+#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#. <entry>
+#. <name>Fugro (Denmark)</name>
+#: build/trans_wms.java:342
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Данія)"
 
-#. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:43
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
+#. <max-zoom>19</max-zoom>
+#. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
+#. <terms-of-use-url>http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2</terms-of-use-url>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--false;Stevns (Denmark);tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune-->
+#. <entry>
+#. <name>Stevns (Denmark)</name>
+#: build/trans_wms.java:354
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Данія)"
 
-#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
-#: build/trans_wms.java:44
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='55.23403' min-lon='12.09144' max-lat='55.43647' max-lon='12.47712'/>
+#. <max-zoom>20</max-zoom>
+#. <attribution-text mandatory='true'>Stevns Kommune</attribution-text>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--only for Phillipines-->
+#. <!--false;Pangasinan (Phillipines HiRes);tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines-->
+#. <entry>
+#. <name>Pangasinan (Phillipines HiRes)</name>
+#: build/trans_wms.java:365
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Пангасінан (Філіппіни HiRes)"
 
-#. scanex:irs;;;IRS
-#: build/trans_wms.java:45
+#. <type>tms</type>
+#. <url><![CDATA[http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png]]></url>
+#. <country-code>PH</country-code>
+#. </entry>
+#. <!--only for Russia-->
+#. <!--false;ScanEx IRS;scanex:irs;;;IRS-->
+#. <entry>
+#. <name>ScanEx IRS</name>
+#: build/trans_wms.java:373
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
 
-#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
-#: build/trans_wms.java:46
+#. <type>scanex</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://irs.gis-lab.info/</url>
+#. <attribution-text mandatory='true'>IRS</attribution-text>
+#. <country-code>RU</country-code>
+#. </entry>
+#. <!--only for South Africa-->
+#. <!--false;South Africa Topo (OOC);tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1-->
+#. <entry>
+#. <name>South Africa Topo (OOC)</name>
+#: build/trans_wms.java:383
 msgid "South Africa Topo (OOC)"
 msgstr "Південна Африка Topo (OOC)"
@@ -41454,17 +41856,15 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
-#, fuzzy
 msgid "Merge overlap"
-msgstr "Об’єднати шари"
+msgstr "Злиття перекриття"
 
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
-#, fuzzy
 msgid "Merge overlap of ways."
-msgstr "Злиття частин шляхів, що перекриваються."
+msgstr "Злиття перекриття ліній."
 
 #. Commit
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
 msgid "Merge Overlap (combine)"
-msgstr ""
+msgstr "Злиття перекриття (комбіноване)"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49
@@ -44967,4 +45367,29 @@
 msgstr "Від’єднання точки від лінії"
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#, fuzzy
+msgid "Open custom URL"
+msgstr "Відкрити URL посилання."
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#, fuzzy
+msgid "Opens specified URL browser"
+msgstr "Відкрити в оглядачі"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:141
+msgid ""
+"You can open custom URL for <b>one</b> selected object<br/> <b>&#123;"
+"key&#125;</b> is replaced with the tag walue<br/> <b>&#123;#id&#125;</b> is "
+"replaced with the element ID<br/> <b>&#123;#type&#125;</b> is replaced with "
+"\"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;"
+"</b> is replaced with element latitude/longitude"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:151
+#, fuzzy
+msgid "Configure custom URL"
+msgstr "Налаштувати сайти…"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
@@ -45026,5 +45451,5 @@
 msgstr "Розділені Зв’язки"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
 msgid "More tools"
 msgstr "Ще інструменти"
@@ -45533,26 +45958,4 @@
 msgstr "Керуйте гоночним автомобілем на цьому шарі"
 
-#~ msgid ""
-#~ "<b>tags:</b>... - object with given number of tags (tags:count or tags:"
-#~ "min-max)"
-#~ msgstr ""
-#~ "<b>tags:</b>… — об’єкт із зазначеною кількістю теґів (tags:кількість або "
-#~ "tags:мін-макс)"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" way."
-#~ msgstr "Лінія «з» не починається або закінчується лінією «через»"
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" way."
-#~ msgstr "Лінія «до» не починається або закінчується лінією «через»"
-
-#~ msgid "Reversed water: land not on left side"
-#~ msgstr "Зворотня лінія водойми: земля не ліворуч"
-
-#~ msgid "Incline Steep"
-#~ msgstr "Крутий нахил"
-
-#~ msgid "fossil"
-#~ msgstr "теплова"
-
-#~ msgid "wind_turbine"
-#~ msgstr "вітротурбіна"
+#~ msgid "oneway combined with *:backward/forward"
+#~ msgstr "oneway скомбіновано з *:backward/forward"
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 26612)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 26613)
@@ -5,12 +5,30 @@
 # mmyfl <mmyangfl@gmail.com>, 2011.
 #
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://tile.openstreetmap.org/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik B&W);tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#. <type>wms</type>
+#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Hike & Bike;tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm-->
+#. <entry>
+#. <name>Hike &amp; Bike</name>
+#: build/trans_wms.java:52 build/trans_wms.java:130
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 16:10+0200\n"
-"PO-Revision-Date: 2011-08-23 17:21+0000\n"
-"Last-Translator: sinopitt <Unknown>\n"
-"Language-Team: Simplified Chinese <>\n"
+"POT-Creation-Date: 2011-09-02 21:25+0200\n"
+"PO-Revision-Date: 2011-08-29 11:39+0000\n"
+"Last-Translator: mmyfl <Unknown>\n"
+"Language-Team: Simplified Chinese <<Unknown>>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +36,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-08-28 11:57+0000\n"
-"X-Generator: Launchpad (build 13794)\n"
+"X-Launchpad-Export-Date: 2011-09-02 19:15+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -27,6 +45,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -52,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
@@ -70,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:444
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -86,6 +104,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:254
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
@@ -165,6 +183,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:397
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
@@ -371,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -395,10 +413,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:109
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:157
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
@@ -411,5 +429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:104
@@ -454,4 +472,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "Cancel"
 msgstr "取消"
@@ -505,5 +524,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
 msgid "Add a node by entering latitude / longitude or easting / northing."
-msgstr ""
+msgstr "输入纬度/经度或东移/北移以添加一个节点。"
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -517,5 +536,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -561,6 +580,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
@@ -598,4 +617,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -632,5 +652,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:70
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -818,6 +838,6 @@
 msgstr "请选择至少两个以上的路径来合并。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:120
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:368
@@ -826,11 +846,19 @@
 msgstr "复制"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "复制选定对象到剪贴板。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:69
 msgid "Please select something to copy."
 msgstr "请选择要复制的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+msgid "Copy Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+msgid "Copy coordinates of selected nodes to clipboard."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
@@ -871,5 +899,5 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:89
 msgid "No data loaded."
-msgstr "没有载入数据。"
+msgstr "没有加载数据。"
 
 #. Sometimes it make sense creating multipoly of only one way (so it will form outer way)
@@ -1215,5 +1243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:122
@@ -1234,4 +1262,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "OK"
 msgstr "确定"
@@ -1462,14 +1491,14 @@
 msgstr "无法分析经/纬度"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "修正的图片..."
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
 msgstr "从多种服务下载修正的图片"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 #, java-format
 msgid "WMS: {0}"
@@ -1480,26 +1509,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
 msgstr "自定义 WMS 连接"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:114
 msgid "Supported Rectifier Services:"
 msgstr "支持的修正器服务："
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:140
 msgid "Visit Homepage"
 msgstr "访问首页"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:151
 msgid "WMS URL or Image ID:"
 msgstr "WMS URL 或图片 ID："
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 msgid "Add Rectified Image"
 msgstr "添加修正的图片"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:209
 msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
@@ -1507,5 +1536,5 @@
 msgstr "无法匹配输入链接或 id 到选定的服务器。请再试一次。"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
 msgid "No valid WMS URL or id"
 msgstr "没有有效的 WMS URL 或 id"
@@ -1609,7 +1638,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "up"
 msgstr "向上"
@@ -1647,7 +1676,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "down"
 msgstr "向下"
@@ -1684,5 +1713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:443
 msgid "Cannot move objects outside of the world."
 msgstr "不能移动对象到世界之外。"
@@ -1741,9 +1770,5 @@
 msgstr "打开文件"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
-msgid "Opening 1 file..."
-msgstr "正在打开 1 个文件..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
 #, java-format
 msgid "Opening {0} file..."
@@ -1751,5 +1776,5 @@
 msgstr[0] "正在打开 {0} 个文件..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1790,5 +1815,5 @@
 msgstr "下载数据"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1803,28 +1828,28 @@
 "为 Shift-Q。)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:184
 msgid "Orthogonalize Shape"
 msgstr "形状直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:50
 msgid "Move nodes so all angles are 90 or 180 degrees"
 msgstr "移动节点使所有的角度为 90 或 180 度"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 msgid "Orthogonalize Shape / Undo"
 msgstr "形状直角化/撤销"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:83
 msgid "Undo orthogonalization for certain nodes"
 msgstr "撤销某些节点的直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Orthogonalize / Undo"
 msgstr "直角化/撤销"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:113
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1835,9 +1860,9 @@
 "请选择被前一次形状直角化动作所移动的节点！"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:115
 msgid "Undo Orthogonalize Shape"
 msgstr "撤销形状直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1848,22 +1873,22 @@
 "<br>改变您的投影法可以去除这项警告。<br>是否要继续？</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:153
 msgid "Selection must consist only of ways and nodes."
 msgstr "选择范围必须由路径和节点组成。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
 msgid "Orthogonalize"
 msgstr "直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
 msgid "Usage"
 msgstr "使用说明"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:191
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "选定的元素不能直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:279
 msgid ""
 "<html>Please make sure all selected ways head in a similar direction<br>or "
@@ -1873,5 +1898,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:419
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:432
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr "请选择角度大约为 90 或 180 度的路径。"
@@ -1879,6 +1904,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
@@ -1993,5 +2018,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Redo"
 msgstr "重做"
@@ -2125,27 +2150,27 @@
 msgstr "选择数据图层中所有取消删除的对象。这样也会选择不完整的对象。"
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
 msgid "Show Status Report"
 msgstr "显示状态报告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "显示有与程序错误相关信息的状态报告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
 #, java-format
 msgid "Help: {0}"
 msgstr "帮助：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "状态报告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "复制到剪贴板，并关闭"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
@@ -2407,5 +2432,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2708,5 +2733,5 @@
 msgid ""
 "Ignoring exception because download has been canceled. Exception was: {0}"
-msgstr ""
+msgstr "正在忽略异常，因为下载已被取消。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2799,15 +2824,15 @@
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) 正在载入节点 {2} 的父项目"
+msgstr "({0}/{1}) 正在加载节点 {2} 的父项目"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:234
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) 正在载入路径 {2} 的父项目"
+msgstr "({0}/{1}) 正在加载路径 {2} 的父项目"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:235
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) 正在载入关系 {2} 的父项目"
+msgstr "({0}/{1}) 正在加载关系 {2} 的父项目"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
@@ -2827,5 +2852,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -2846,5 +2871,5 @@
 msgstr ""
 "点击可进行删除。Shift：删除路径区段。Alt：删除路径时不要删除未使用的节点。"
-"Ctrl：删除参考的对象。"
+"Ctrl：删除参照的对象。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
@@ -2966,5 +2991,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:184
 msgid "Hold Ctrl to toggle snapping"
-msgstr ""
+msgstr "按住 Ctrl 以切换对齐"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:534
@@ -2991,8 +3016,8 @@
 "将播放开头拖曳并放至要播放音频的轨迹旁；按SHIFT+释放就会从那一点同步化音频。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
@@ -3007,9 +3032,9 @@
 msgstr "选择"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 msgid "Select, move, scale and rotate objects"
 msgstr "选定、移动、缩放和旋转对象"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:405
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -3017,17 +3042,17 @@
 msgstr[0] "添加并移动虚拟新节点至 {0} 条路径"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:755
 msgid "Move elements"
 msgstr "移动元素"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Move them"
 msgstr "移动它们"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Undo move"
 msgstr "取消移动"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:758
 #, java-format
 msgid ""
@@ -3039,22 +3064,22 @@
 "真的要移动它们吗？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:918
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放开鼠标按钮以选择矩形内的对象。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:920
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放开鼠标按钮以停止移动。按 Ctrl 则会与最近的节点合并。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:922
 msgid "Release the mouse button to stop rotating."
 msgstr "放开鼠标按钮以停止旋转。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:924
 msgid "Release the mouse button to stop scaling."
 msgstr "放开鼠标按键以停止缩放。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:926
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3209,97 +3234,88 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
-#, fuzzy
 msgid "Special targets"
-msgstr "<u>特殊的目标：</u>"
+msgstr "特别目标"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
-#, fuzzy
-msgid ""
-"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+msgid ""
+"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
 "<b>relation</b>)"
 msgstr ""
-"<b>type:</b> - 对象的类型(<b>节点(node)</b>，<b>路径(way)</b>，<b>关系"
-"(relation)</b>)"
+"<b>type:</b>... - 对应类型的对象[<b>node</b>(节点), <b>way</b>(路径), "
+"<b>relation</b>(关系)]"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
-#, fuzzy
 msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - 所有由某用户改变的对象"
+msgstr "<b>user:</b>... - 由用户更改的对象"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
-#, fuzzy
 msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 所有对象是由匿名用户所改变的"
+msgstr "<b>user:anonymous</b> - 由匿名用户更改的对象"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#, fuzzy
 msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - 以此为 ID 的对象(0 为新的对象)"
+msgstr "<b>id:</b>... - 带有给定 ID 的对象(0 为新对象)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#, fuzzy
 msgid ""
 "<b>version:</b>... - objects with given version (0 objects without an "
 "assigned version)"
-msgstr "<b>version:</b>... - 查看这个版本的对象(未指定版本则为 0 个对象)"
+msgstr "<b>version:</b>... - 带有给定版本的对象(0 为没有分配版本的对象)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
-#, fuzzy
 msgid ""
 "<b>changeset:</b>... - objects with given changeset id (0 objects without "
 "assigned changeset)"
 msgstr ""
-"<b>changeset:</b>... - 查看这个修改集合 id 的对象(未指定修改集合则为 0 个对"
-"象)"
+"<b>changeset:</b>... - 带有给定修改集合 ID 的对象(0 为没有分配修改集合的对象)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
-#, fuzzy
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
-"min-max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>nodes:</b>... - 有指定数量的节点的对象(nodes:count 或 nodes:min-max)"
+msgid ""
+"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
+"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
+msgstr ""
+"<b>nodes:</b>... - 带有给定节点数目的对象[<b>nodes:</b>count(指定数目)，"
+"<b>nodes:</b>min-max(指定范围)，<b>nodes:</b>min-(指定下限) 或 <b>nodes:</b>-"
+"max(指定上限)]"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
-#, fuzzy
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
-"max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>nodes:</b>... - 有指定数量的节点的对象(nodes:count 或 nodes:min-max)"
+msgid ""
+"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
+"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
+msgstr ""
+"<b>tags:</b>... - 带有给定标签数目的对象[<b>tags:</b>count(指定数目)，"
+"<b>tags:</b>min-max(指定范围)，<b>tags:</b>min-(指定下限) 或 <b>tags:</b>-max"
+"(指定上限)]"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
-#, fuzzy
 msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - 在关系中指定角色的对象"
+msgstr "<b>role:</b>... - 带有给定关系角色的对象"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
-#, fuzzy
-msgid ""
-"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
-"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>timestamp:</b>... - 有此时间戳记的对象 (<b>2009-11-12T14:51:09Z</b>, "
-"<b>2009-11-12</b > 或 <b>T14:51</b> ...)"
+msgid ""
+"<b>timestamp:</b>... - objects with this timestamp (2009-11-12T14:51:09Z, "
+"2009-11-12 or T14:51 ...)"
+msgstr ""
+"<b>timestamp:</b>... - 带有这个时间戳的对象 (2009-11-12T14:51:09Z，"
+"2009-11-12 或 T14:51 ...)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#, fuzzy
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
-"areasize:max)"
-msgstr ""
-"<b>areasize:</b>... - 封闭路径中区域的最小和最大面积(m²)。(areasize:MIN-MAX "
-"或 areasize:MAX)"
+msgid ""
+"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
+"max or <b>areasize:</b>max)"
+msgstr ""
+"<b>areasize:</b>... - 带有给定面积的封闭路径(以 m² 计)(<b>areasize:</b>min-"
+"max(指定范围) 或 <b>areasize:</b>max(指定上限)]"
 
 #. I18n: don't translate the bold text keyword
@@ -3346,4 +3362,6 @@
 "members) in downloaded area"
 msgstr ""
+"<b>(all)indownloadedarea</b> - 在已下载区域中的对象(和其所有的路径节点/关系成"
+"员)"
 
 #. I18n: don't translate the bold text keyword
@@ -3352,5 +3370,5 @@
 "<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
 "current view"
-msgstr ""
+msgstr "<b>(all)inview</b> - 在当前视图中的对象(和其所有的路径节点/关系成员)"
 
 #. I18n: don't translate the bold text keyword
@@ -3621,5 +3639,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1710 build/trans_presets.java:3619
+#: build/trans_presets.java:1723 build/trans_presets.java:3632
 msgid "Other"
 msgstr "其他"
@@ -3631,5 +3649,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
 msgid "Suspicious data found. Upload anyway?"
-msgstr ""
+msgstr "发现可疑的数据。强制上传？"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -4126,5 +4144,5 @@
 "Warning: Failed to initialize preferences. Failed to reset preference file "
 "to default: {0}"
-msgstr ""
+msgstr "警告：无法初始化首选项。无法重置为默认首选项文件：{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4145,10 +4163,10 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:126
 msgid "Could not load preferences from server."
-msgstr "无法从服务器载入首选项。"
+msgstr "无法从服务器加载首选项。"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
 #, java-format
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "无法载入资源“{0}”，错误为 {1}。"
+msgstr "无法加载资源“{0}”，错误为 {1}。"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:98
@@ -4161,9 +4179,9 @@
 msgid ""
 "Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
+msgstr "警告：意外的 JOSM 修订文件版本号，值为“{0}”"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "警告：缺少修订版文件“/REVISION”。"
+msgstr "警告：缺少修订文件“/REVISION”。"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -4265,4 +4283,7 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM 希望在数据集合中找到原型 [{0} {1}] ，但它不存在。请在 http://josm."
+"openstreetmap.de/ 报告此问题。这不是一个严重的错误，继续您的工作应该是安全"
+"的。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4338,5 +4359,5 @@
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
@@ -4347,5 +4368,5 @@
 #. ICON(data/)
 #. light cyan
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:14
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:64
@@ -4356,5 +4377,5 @@
 #. ICON(data/)
 #. dark blue
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
@@ -4367,10 +4388,10 @@
 #. only for display, no real type
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:18
 msgid "closedway"
 msgstr "封闭路径"
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:16
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:19
 msgid "multipolygon"
 msgstr "多重多边形"
@@ -4405,5 +4426,5 @@
 msgid ""
 "Error: failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr "错误：无法载入地图渲染类“{0}”。没有找到类。"
+msgstr "错误：无法加载地图渲染类“{0}”。没有找到类。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:143
@@ -4519,5 +4540,5 @@
 #, java-format
 msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
+msgstr "错误：无法打开输入流资源“/data/{0}”。"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
@@ -4534,5 +4555,5 @@
 "Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
-msgstr ""
+msgstr "错误：无法打开输入流资源“/data/{0}”。无法加载 NTF<->RGF93 网格"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
@@ -4682,21 +4703,21 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
 msgid "GRS80"
-msgstr ""
+msgstr "GRS80"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
 msgid "WGS84"
-msgstr ""
+msgstr "WGS84"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
 msgid "Lambert Conformal Conic"
-msgstr ""
+msgstr "兰勃特等角投影"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
 msgid "Swiss Oblique Mercator"
-msgstr ""
+msgstr "瑞士斜轴麦卡托"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
 msgid "Transverse Mercator"
-msgstr ""
+msgstr "横轴麦卡托"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4907,5 +4928,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4272
 msgid "Multipolygon"
 msgstr "多重多边形"
@@ -5115,5 +5136,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:153
 msgid "This plugin checks for errors in property keys and values."
-msgstr "这个插件会检查属性中的设定键和数值有无错误。"
+msgstr "这个插件会检查属性中的键值和数值有无错误。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:265
@@ -5153,5 +5174,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:428
 msgid "Tag key contains character with code less than 0x20"
-msgstr "标签设定键包含小于 0x20 字节的字符代码"
+msgstr "标签键值包含小于 0x20 字节的字符代码"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:433
@@ -5161,5 +5182,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:438
 msgid "Tag key longer than allowed"
-msgstr "标签设定键长过允许值"
+msgstr "标签键值长过允许值"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:443
@@ -5169,9 +5190,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:448
 msgid "Invalid property key"
-msgstr "无效的属性设定键"
+msgstr "无效的属性键值"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:453
 msgid "Invalid white space in property key"
-msgstr "属性设定键中有无效的空白字节"
+msgstr "属性键值中有无效的空白字节"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:458
@@ -5190,5 +5211,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:488
 msgid "Presets do not contain property key"
-msgstr "预设组合不包含属性设定键"
+msgstr "预设组合不包含属性键值"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:507
@@ -5207,9 +5228,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:565
 msgid "Check property keys."
-msgstr "检查属性设定键。"
+msgstr "检查属性键值。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:566
 msgid "Validate that property keys are valid checking against list of words."
-msgstr "检查文字列表，以验证属性设定键是有效的。"
+msgstr "检查文字列表，以验证属性键值是有效的。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:573
@@ -5245,5 +5266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
@@ -5264,5 +5285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:624
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:253
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:191
 msgid "Please select the row to edit."
@@ -5270,5 +5291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:228
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
@@ -5392,11 +5413,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
-#, fuzzy
 msgid "More than one \"via\" node found"
-msgstr "找到一个以上的“经过”路径"
+msgstr "找到一个以上的“经过”节点"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
 msgid "Cannot mix node and way for role \"via\""
-msgstr ""
+msgstr "不能混合节点和路径作为“经过”角色"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:127
@@ -5422,13 +5442,13 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:151
 msgid "The \"from\" and the first \"via\" way are not connected."
-msgstr ""
+msgstr "“出发”和第一条“到达”路径未连接。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:157
 msgid "The \"via\" ways are not connected."
-msgstr ""
+msgstr "多条“经过”路径没有连接。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:161
 msgid "The last \"via\" and the \"to\" way are not connected."
-msgstr ""
+msgstr "最后的“经过”和“到达”路径未连接。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32
@@ -5739,5 +5759,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "railway"
 msgstr "铁路"
@@ -5790,13 +5810,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:104
 msgid "Security exception"
-msgstr "安全性例外"
+msgstr "安全性异常"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:122
 msgid "Network exception"
-msgstr "网络例外"
+msgstr "网络异常"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:140
 msgid "IO Exception"
-msgstr "IO 例外"
+msgstr "IO 异常"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157
@@ -5879,8 +5899,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:72
 msgid "Open a blank WMS layer to load data from a file"
-msgstr "开启空白 WMS 图层，以便自文件载入数据"
+msgstr "开启空白 WMS 图层，以便自文件加载数据"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 msgid "Imagery"
 msgstr "图像(I)"
@@ -5961,10 +5981,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:172
 msgid "Username"
 msgstr "用户名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:180
 msgid "Password"
 msgstr "密码"
@@ -6056,5 +6076,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "Make sure you load some data if you use --selection."
-msgstr "如果您使用 --selection，请确定已载入了一些数据。"
+msgstr "如果您使用 --selection，请确定已加载了一些数据。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
@@ -6072,5 +6092,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
 msgid "Loading early plugins"
-msgstr "载入较早的插件"
+msgstr "加载较早的插件"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:232
@@ -6084,5 +6104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:244
 msgid "Loading plugins"
-msgstr "正在载入插件"
+msgstr "正在加载插件"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:275
@@ -6115,5 +6135,5 @@
 msgstr "首选项 {0} 已经被删除，因为它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -6121,10 +6141,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "查看(V)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6133,5 +6153,5 @@
 msgstr "工具(T)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6139,5 +6159,5 @@
 msgstr "预设组合(P)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6148,5 +6168,5 @@
 msgstr "菜单：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
 msgid "Audio"
 msgstr "音频(A)"
@@ -6388,4 +6408,7 @@
 "html>"
 msgstr ""
+"<html>或者您可以为单一的拼贴输入<strong>拼贴地址</strong>，格式为<i>缩放等级/"
+"x/y</i>，例如 <i>15/256/223</i>。拼贴地址格式<i>缩放,x,y</i> 或<i>缩放;x;y</"
+"i> 也是有效的。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6553,5 +6576,5 @@
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "标签({0} 冲突)"
+msgstr[0] "标签({0} 个冲突)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
@@ -6610,5 +6633,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:282
 msgid "Conflict Resolution"
-msgstr "冲突的决议"
+msgstr "解决冲突"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:319
@@ -6645,5 +6668,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:236
 msgid "lock scrolling"
-msgstr "锁定卷动"
+msgstr "锁定滚动"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:244
@@ -6670,5 +6693,5 @@
 "List of merged elements. They will replace the list of my elements when the "
 "merge decisions are applied."
-msgstr ""
+msgstr "合并后的元素列表。应用合并决定时，他们将替代我的元素列表。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6893,9 +6916,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
 msgid "Keep my coordinates"
-msgstr ""
+msgstr "保持我的坐标"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
 msgid "Keep their coordinates"
-msgstr ""
+msgstr "保持他们的坐标"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6955,5 +6978,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:276
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
@@ -7081,5 +7104,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7335,6 +7358,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Download"
 msgstr "下载"
@@ -7402,14 +7425,14 @@
 msgstr "切换：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:308
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr "选择用在这个命令中的对象(除非目前已被删除)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:369
 msgid "Undo the selected and all later commands"
 msgstr "取消选定以及之后所有的命令"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
 msgid "Redo the selected and all earlier commands"
 msgstr "重复选定动作以及之后所有的命令"
@@ -7590,5 +7613,5 @@
 msgctxt "filter"
 msgid "F"
-msgstr "F"
+msgstr "过滤"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:371
@@ -7630,9 +7653,9 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
-msgstr "重新载入"
+msgstr "重新加载"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
 msgid "Reload all currently selected objects and refresh the list."
-msgstr "重新载入所有目前的对象，并重新整理列表。"
+msgstr "重新加载所有目前的对象，并重新整理列表。"
 
 #. JButton
@@ -7660,7 +7683,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-#, fuzzy
 msgid "In conflict with:\n"
-msgstr "冲突"
+msgstr "有冲突：\n"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
@@ -7873,10 +7895,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:581 build/trans_presets.java:628
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:2362 build/trans_presets.java:2709
-#: build/trans_presets.java:2710 build/trans_presets.java:2711
+#: build/trans_presets.java:581 build/trans_presets.java:640
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:2375 build/trans_presets.java:2722
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -7924,18 +7946,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:130
 msgid "Projected coordinates:"
-msgstr ""
+msgstr "投影坐标："
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:138
 msgid ""
 "Enter easting and northing (x and y) separated by space, comma or semicolon."
-msgstr ""
+msgstr "输入东移量和北移量(x 和 y)，用空格、逗号或分号分隔。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:154
 msgid "Lat/Lon"
-msgstr ""
+msgstr "纬度/经度"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:155
 msgid "East/North"
-msgstr ""
+msgstr "东移/北移"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:258
@@ -7947,10 +7969,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:280
 msgid "Please enter a Easting and Northing"
-msgstr ""
+msgstr "请输入东移量和北移量"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:144
 #, java-format
 msgid "Toggle visibility of layer: {0}"
-msgstr ""
+msgstr "切换图层的可见度：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -7961,5 +7983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Open a list of all loaded layers."
-msgstr "开启所有载入图层的列表。"
+msgstr "开启所有加载图层的列表。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:353
@@ -8058,9 +8080,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:376
 msgid "Reload from file"
-msgstr "从文件中重新载入"
+msgstr "从文件中重新加载"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:377
 msgid "reload selected styles from file"
-msgstr "从文件中重新载入选定的样式"
+msgstr "从文件中重新加载选定的样式"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:425
@@ -8075,5 +8097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:231
 msgid "Reloading style sources"
-msgstr "重新载入样式来源"
+msgstr "重新加载样式来源"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:480
@@ -8092,5 +8114,5 @@
 #. item "Power/Power Generator" combo "Source"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
@@ -8136,5 +8158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4271
 msgid "Relations"
 msgstr "关系"
@@ -8273,5 +8295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:60
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62
 msgid "Selection"
 msgstr "选择(N)"
@@ -8352,5 +8374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
 msgid "Load CT"
-msgstr "载入贡献者条款"
+msgstr "加载贡献者条款"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:265
@@ -8359,5 +8381,5 @@
 "agreed to the new contributor terms will show a green check mark."
 msgstr ""
-"从服务器载入有关更新授权的信息。已同意新贡献者条款的用户会显示绿勾标记。"
+"从服务器加载有关更新授权的信息。已同意新贡献者条款的用户会显示绿勾标记。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
@@ -8905,5 +8927,4 @@
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Rental" text "Name"
-#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
@@ -9576,175 +9597,175 @@
 #: build/trans_presets.java:503 build/trans_presets.java:519
 #: build/trans_presets.java:535 build/trans_presets.java:561
-#: build/trans_presets.java:598 build/trans_presets.java:620
-#: build/trans_presets.java:645 build/trans_presets.java:669
-#: build/trans_presets.java:690 build/trans_presets.java:711
-#: build/trans_presets.java:731 build/trans_presets.java:741
-#: build/trans_presets.java:752 build/trans_presets.java:814
-#: build/trans_presets.java:832 build/trans_presets.java:841
-#: build/trans_presets.java:914 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1097 build/trans_presets.java:1108
-#: build/trans_presets.java:1117 build/trans_presets.java:1123
-#: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:598 build/trans_presets.java:632
+#: build/trans_presets.java:657 build/trans_presets.java:681
+#: build/trans_presets.java:702 build/trans_presets.java:723
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:764 build/trans_presets.java:826
+#: build/trans_presets.java:844 build/trans_presets.java:853
+#: build/trans_presets.java:926 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1101
+#: build/trans_presets.java:1109 build/trans_presets.java:1120
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1143 build/trans_presets.java:1150
 #: build/trans_presets.java:1164 build/trans_presets.java:1171
-#: build/trans_presets.java:1176 build/trans_presets.java:1182
-#: build/trans_presets.java:1189 build/trans_presets.java:1199
-#: build/trans_presets.java:1205 build/trans_presets.java:1211
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1239
-#: build/trans_presets.java:1246 build/trans_presets.java:1252
-#: build/trans_presets.java:1269 build/trans_presets.java:1276
-#: build/trans_presets.java:1283 build/trans_presets.java:1380
-#: build/trans_presets.java:1432 build/trans_presets.java:1446
-#: build/trans_presets.java:1457 build/trans_presets.java:1470
-#: build/trans_presets.java:1483 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1519
-#: build/trans_presets.java:1530 build/trans_presets.java:1541
-#: build/trans_presets.java:1551 build/trans_presets.java:1562
-#: build/trans_presets.java:1568 build/trans_presets.java:1578
-#: build/trans_presets.java:1599 build/trans_presets.java:1631
-#: build/trans_presets.java:1641 build/trans_presets.java:1647
-#: build/trans_presets.java:1655 build/trans_presets.java:1671
-#: build/trans_presets.java:1680 build/trans_presets.java:1690
-#: build/trans_presets.java:1699 build/trans_presets.java:1723
-#: build/trans_presets.java:1731 build/trans_presets.java:1745
-#: build/trans_presets.java:1756 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:1796
-#: build/trans_presets.java:1808 build/trans_presets.java:1819
-#: build/trans_presets.java:1839 build/trans_presets.java:1854
-#: build/trans_presets.java:1862 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1954
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2005 build/trans_presets.java:2022
-#: build/trans_presets.java:2040 build/trans_presets.java:2062
-#: build/trans_presets.java:2081 build/trans_presets.java:2102
-#: build/trans_presets.java:2121 build/trans_presets.java:2138
-#: build/trans_presets.java:2157 build/trans_presets.java:2175
-#: build/trans_presets.java:2192 build/trans_presets.java:2209
-#: build/trans_presets.java:2225 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2247
-#: build/trans_presets.java:2264 build/trans_presets.java:2272
-#: build/trans_presets.java:2287 build/trans_presets.java:2297
-#: build/trans_presets.java:2309 build/trans_presets.java:2319
-#: build/trans_presets.java:2326 build/trans_presets.java:2335
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2359 build/trans_presets.java:2369
-#: build/trans_presets.java:2374 build/trans_presets.java:2382
-#: build/trans_presets.java:2389 build/trans_presets.java:2397
-#: build/trans_presets.java:2406 build/trans_presets.java:2413
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2434 build/trans_presets.java:2445
-#: build/trans_presets.java:2457 build/trans_presets.java:2463
-#: build/trans_presets.java:2470 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2546
-#: build/trans_presets.java:2556 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2583 build/trans_presets.java:2591
-#: build/trans_presets.java:2623 build/trans_presets.java:2701
-#: build/trans_presets.java:2719 build/trans_presets.java:2729
-#: build/trans_presets.java:2744 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2771
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2879 build/trans_presets.java:2888
-#: build/trans_presets.java:2896 build/trans_presets.java:2902
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2952
-#: build/trans_presets.java:2961 build/trans_presets.java:2968
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2998 build/trans_presets.java:3004
-#: build/trans_presets.java:3010 build/trans_presets.java:3016
-#: build/trans_presets.java:3022 build/trans_presets.java:3028
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1188 build/trans_presets.java:1194
+#: build/trans_presets.java:1201 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1223
+#: build/trans_presets.java:1228 build/trans_presets.java:1234
+#: build/trans_presets.java:1242 build/trans_presets.java:1251
+#: build/trans_presets.java:1258 build/trans_presets.java:1264
+#: build/trans_presets.java:1281 build/trans_presets.java:1288
+#: build/trans_presets.java:1295 build/trans_presets.java:1392
+#: build/trans_presets.java:1444 build/trans_presets.java:1458
+#: build/trans_presets.java:1469 build/trans_presets.java:1482
+#: build/trans_presets.java:1495 build/trans_presets.java:1509
+#: build/trans_presets.java:1520 build/trans_presets.java:1531
+#: build/trans_presets.java:1542 build/trans_presets.java:1553
+#: build/trans_presets.java:1563 build/trans_presets.java:1574
+#: build/trans_presets.java:1580 build/trans_presets.java:1590
+#: build/trans_presets.java:1611 build/trans_presets.java:1643
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1683
+#: build/trans_presets.java:1694 build/trans_presets.java:1703
+#: build/trans_presets.java:1712 build/trans_presets.java:1736
+#: build/trans_presets.java:1744 build/trans_presets.java:1758
+#: build/trans_presets.java:1769 build/trans_presets.java:1779
+#: build/trans_presets.java:1789 build/trans_presets.java:1809
+#: build/trans_presets.java:1821 build/trans_presets.java:1832
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:1875 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1967
+#: build/trans_presets.java:1984 build/trans_presets.java:2001
+#: build/trans_presets.java:2018 build/trans_presets.java:2035
+#: build/trans_presets.java:2053 build/trans_presets.java:2075
+#: build/trans_presets.java:2094 build/trans_presets.java:2115
+#: build/trans_presets.java:2134 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2188
+#: build/trans_presets.java:2205 build/trans_presets.java:2222
+#: build/trans_presets.java:2238 build/trans_presets.java:2245
+#: build/trans_presets.java:2253 build/trans_presets.java:2260
+#: build/trans_presets.java:2277 build/trans_presets.java:2285
+#: build/trans_presets.java:2300 build/trans_presets.java:2310
+#: build/trans_presets.java:2322 build/trans_presets.java:2332
+#: build/trans_presets.java:2339 build/trans_presets.java:2348
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2372 build/trans_presets.java:2382
+#: build/trans_presets.java:2387 build/trans_presets.java:2395
+#: build/trans_presets.java:2402 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2426
+#: build/trans_presets.java:2433 build/trans_presets.java:2439
+#: build/trans_presets.java:2447 build/trans_presets.java:2458
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2491
+#: build/trans_presets.java:2498 build/trans_presets.java:2505
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2526 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2552 build/trans_presets.java:2559
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
+#: build/trans_presets.java:2596 build/trans_presets.java:2604
+#: build/trans_presets.java:2636 build/trans_presets.java:2714
+#: build/trans_presets.java:2732 build/trans_presets.java:2742
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2784
+#: build/trans_presets.java:2793 build/trans_presets.java:2799
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2892 build/trans_presets.java:2901
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2951
+#: build/trans_presets.java:2957 build/trans_presets.java:2965
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3041
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
 #: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3080 build/trans_presets.java:3095
-#: build/trans_presets.java:3102 build/trans_presets.java:3110
-#: build/trans_presets.java:3115 build/trans_presets.java:3130
-#: build/trans_presets.java:3137 build/trans_presets.java:3149
-#: build/trans_presets.java:3159 build/trans_presets.java:3166
-#: build/trans_presets.java:3175 build/trans_presets.java:3182
-#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3074 build/trans_presets.java:3080
+#: build/trans_presets.java:3093 build/trans_presets.java:3108
+#: build/trans_presets.java:3115 build/trans_presets.java:3123
+#: build/trans_presets.java:3128 build/trans_presets.java:3143
+#: build/trans_presets.java:3150 build/trans_presets.java:3162
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3188 build/trans_presets.java:3195
 #: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3222 build/trans_presets.java:3232
-#: build/trans_presets.java:3238 build/trans_presets.java:3249
-#: build/trans_presets.java:3269 build/trans_presets.java:3325
-#: build/trans_presets.java:3331 build/trans_presets.java:3339
-#: build/trans_presets.java:3346 build/trans_presets.java:3352
-#: build/trans_presets.java:3358 build/trans_presets.java:3364
-#: build/trans_presets.java:3369 build/trans_presets.java:3374
-#: build/trans_presets.java:3379 build/trans_presets.java:3388
-#: build/trans_presets.java:3395 build/trans_presets.java:3402
-#: build/trans_presets.java:3410 build/trans_presets.java:3417
-#: build/trans_presets.java:3425 build/trans_presets.java:3434
-#: build/trans_presets.java:3442 build/trans_presets.java:3451
-#: build/trans_presets.java:3460 build/trans_presets.java:3467
-#: build/trans_presets.java:3475 build/trans_presets.java:3481
-#: build/trans_presets.java:3489 build/trans_presets.java:3497
-#: build/trans_presets.java:3504 build/trans_presets.java:3511
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3538
-#: build/trans_presets.java:3546 build/trans_presets.java:3555
-#: build/trans_presets.java:3561 build/trans_presets.java:3569
-#: build/trans_presets.java:3578 build/trans_presets.java:3585
-#: build/trans_presets.java:3591 build/trans_presets.java:3600
-#: build/trans_presets.java:3609 build/trans_presets.java:3625
-#: build/trans_presets.java:3634 build/trans_presets.java:3642
-#: build/trans_presets.java:3648 build/trans_presets.java:3654
-#: build/trans_presets.java:3662 build/trans_presets.java:3671
-#: build/trans_presets.java:3680 build/trans_presets.java:3687
-#: build/trans_presets.java:3695 build/trans_presets.java:3702
-#: build/trans_presets.java:3710 build/trans_presets.java:3718
-#: build/trans_presets.java:3726 build/trans_presets.java:3735
-#: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3760 build/trans_presets.java:3767
-#: build/trans_presets.java:3774 build/trans_presets.java:3782
-#: build/trans_presets.java:3789 build/trans_presets.java:3797
-#: build/trans_presets.java:3824 build/trans_presets.java:3830
-#: build/trans_presets.java:3836 build/trans_presets.java:3842
-#: build/trans_presets.java:3848 build/trans_presets.java:3856
-#: build/trans_presets.java:3863 build/trans_presets.java:3870
-#: build/trans_presets.java:3877 build/trans_presets.java:3884
-#: build/trans_presets.java:3892 build/trans_presets.java:3900
-#: build/trans_presets.java:3908 build/trans_presets.java:3915
-#: build/trans_presets.java:3922 build/trans_presets.java:3929
-#: build/trans_presets.java:3938 build/trans_presets.java:3947
-#: build/trans_presets.java:3955 build/trans_presets.java:3963
-#: build/trans_presets.java:3971 build/trans_presets.java:3980
-#: build/trans_presets.java:3988 build/trans_presets.java:3998
-#: build/trans_presets.java:4008 build/trans_presets.java:4017
-#: build/trans_presets.java:4023 build/trans_presets.java:4029
-#: build/trans_presets.java:4035 build/trans_presets.java:4040
-#: build/trans_presets.java:4046 build/trans_presets.java:4056
-#: build/trans_presets.java:4062 build/trans_presets.java:4068
-#: build/trans_presets.java:4074 build/trans_presets.java:4081
-#: build/trans_presets.java:4088 build/trans_presets.java:4094
-#: build/trans_presets.java:4100 build/trans_presets.java:4107
-#: build/trans_presets.java:4113 build/trans_presets.java:4118
-#: build/trans_presets.java:4125 build/trans_presets.java:4132
-#: build/trans_presets.java:4138 build/trans_presets.java:4147
-#: build/trans_presets.java:4155 build/trans_presets.java:4161
-#: build/trans_presets.java:4167 build/trans_presets.java:4174
-#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:3215 build/trans_presets.java:3221
+#: build/trans_presets.java:3235 build/trans_presets.java:3245
+#: build/trans_presets.java:3251 build/trans_presets.java:3262
+#: build/trans_presets.java:3282 build/trans_presets.java:3338
+#: build/trans_presets.java:3344 build/trans_presets.java:3352
+#: build/trans_presets.java:3359 build/trans_presets.java:3365
+#: build/trans_presets.java:3371 build/trans_presets.java:3377
+#: build/trans_presets.java:3382 build/trans_presets.java:3387
+#: build/trans_presets.java:3392 build/trans_presets.java:3401
+#: build/trans_presets.java:3408 build/trans_presets.java:3415
+#: build/trans_presets.java:3423 build/trans_presets.java:3430
+#: build/trans_presets.java:3438 build/trans_presets.java:3447
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3480
+#: build/trans_presets.java:3488 build/trans_presets.java:3494
+#: build/trans_presets.java:3502 build/trans_presets.java:3510
+#: build/trans_presets.java:3517 build/trans_presets.java:3524
+#: build/trans_presets.java:3530 build/trans_presets.java:3538
+#: build/trans_presets.java:3545 build/trans_presets.java:3551
+#: build/trans_presets.java:3559 build/trans_presets.java:3568
+#: build/trans_presets.java:3574 build/trans_presets.java:3582
+#: build/trans_presets.java:3591 build/trans_presets.java:3598
+#: build/trans_presets.java:3604 build/trans_presets.java:3613
+#: build/trans_presets.java:3622 build/trans_presets.java:3638
+#: build/trans_presets.java:3647 build/trans_presets.java:3655
+#: build/trans_presets.java:3661 build/trans_presets.java:3667
+#: build/trans_presets.java:3675 build/trans_presets.java:3684
+#: build/trans_presets.java:3693 build/trans_presets.java:3700
+#: build/trans_presets.java:3708 build/trans_presets.java:3715
+#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:3739 build/trans_presets.java:3748
+#: build/trans_presets.java:3757 build/trans_presets.java:3765
+#: build/trans_presets.java:3773 build/trans_presets.java:3780
+#: build/trans_presets.java:3787 build/trans_presets.java:3795
+#: build/trans_presets.java:3802 build/trans_presets.java:3810
+#: build/trans_presets.java:3837 build/trans_presets.java:3843
+#: build/trans_presets.java:3849 build/trans_presets.java:3855
+#: build/trans_presets.java:3861 build/trans_presets.java:3869
+#: build/trans_presets.java:3876 build/trans_presets.java:3883
+#: build/trans_presets.java:3890 build/trans_presets.java:3897
+#: build/trans_presets.java:3905 build/trans_presets.java:3913
+#: build/trans_presets.java:3921 build/trans_presets.java:3928
+#: build/trans_presets.java:3935 build/trans_presets.java:3942
+#: build/trans_presets.java:3951 build/trans_presets.java:3960
+#: build/trans_presets.java:3968 build/trans_presets.java:3976
+#: build/trans_presets.java:3984 build/trans_presets.java:3993
+#: build/trans_presets.java:4001 build/trans_presets.java:4011
+#: build/trans_presets.java:4021 build/trans_presets.java:4030
+#: build/trans_presets.java:4036 build/trans_presets.java:4042
+#: build/trans_presets.java:4048 build/trans_presets.java:4053
+#: build/trans_presets.java:4059 build/trans_presets.java:4069
+#: build/trans_presets.java:4075 build/trans_presets.java:4081
+#: build/trans_presets.java:4087 build/trans_presets.java:4094
+#: build/trans_presets.java:4101 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4120
+#: build/trans_presets.java:4126 build/trans_presets.java:4131
+#: build/trans_presets.java:4138 build/trans_presets.java:4145
+#: build/trans_presets.java:4151 build/trans_presets.java:4160
+#: build/trans_presets.java:4168 build/trans_presets.java:4174
+#: build/trans_presets.java:4180 build/trans_presets.java:4187
 #: build/trans_presets.java:4195 build/trans_presets.java:4201
-#: build/trans_presets.java:4207 build/trans_presets.java:4213
-#: build/trans_presets.java:4219 build/trans_presets.java:4266
-#: build/trans_presets.java:4280 build/trans_presets.java:4299
-#: build/trans_presets.java:4318 build/trans_presets.java:4348
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4208 build/trans_presets.java:4214
+#: build/trans_presets.java:4220 build/trans_presets.java:4226
+#: build/trans_presets.java:4232 build/trans_presets.java:4279
+#: build/trans_presets.java:4293 build/trans_presets.java:4312
+#: build/trans_presets.java:4331 build/trans_presets.java:4361
+#: build/trans_presets.java:4386
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -9897,9 +9918,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
-msgstr "只是由下列用户 ID 拥有的修改集合"
+msgstr "只是下列用户 ID 拥有的修改集合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr "只是由下列用户名拥有的修改集合"
+msgstr "只是下列用户名拥有的修改集合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
@@ -9907,5 +9928,5 @@
 "Only changesets owned by myself (disabled. JOSM is currently run by an "
 "anonymous user)"
-msgstr ""
+msgstr "只是我自己拥有的修改集合(禁用。JOSM 目前是以匿名用户运行)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10215,6 +10236,5 @@
 msgid "Change value?"
 msgid_plural "Change values?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "改变数值？"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
@@ -10258,5 +10278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
 msgid "Add value?"
-msgstr ""
+msgstr "添加数值？"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
@@ -10282,5 +10302,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgid "Position"
 msgstr "位置"
@@ -10383,5 +10403,5 @@
 "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
 "loaded</html>"
-msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入</html>"
+msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法加载</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
@@ -10405,5 +10425,5 @@
 #, java-format
 msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
+msgstr "警告：忽略异常，因为任务被取消。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10418,5 +10438,5 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "正在下载关系“{1}”的 {0} 不完整子项目"
+msgstr[0] "正在下载关系“{1}”的 {0} 个不完整子项目"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:106
@@ -10424,6 +10444,5 @@
 msgid "Downloading {0} incomplete child of {1} parent relations"
 msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "正在下载 {1} 个父关系关系的 {0} 个不完整子项目"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10768,9 +10787,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
-msgstr "载入父关系"
+msgstr "加载父关系"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
-msgstr "正在载入父关系"
+msgstr "正在加载父关系"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
@@ -10799,5 +10818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr "载入关系"
+msgstr "加载关系"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10865,25 +10884,25 @@
 msgstr "重新命名目前选定的书签"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lat"
 msgstr "最小纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "min lon"
 msgstr "最小经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lat"
 msgstr "最大纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
 msgid "max lon"
 msgstr "最大经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "Clear textarea"
 msgstr "清除文本区"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -10891,57 +10910,57 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在这里粘贴 URL 下载该区域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
 msgid "Bounding Box"
 msgstr "绑定方块"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
 msgstr "字串“{0}”不是一个合格的 double 数值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161
 msgid "Value for latitude in range [-90,90] required."
 msgstr "纬度的数值范围必须为[-90,90]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201
 msgid "Value for longitude in range [-180,180] required."
 msgstr "经度的数值范围必须为[-180,180]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232
 msgid "Paste URL from clipboard"
 msgstr "从剪贴板粘贴 URL"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
 msgstr "数据来源和类型："
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap 数据"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
 msgid "Select to download OSM data in the selected download area."
 msgstr "选择以下载选定下载区域中的 OSM 数据。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
 msgid "Raw GPS data"
 msgstr "原始 GPS 数据"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download GPS traces in the selected download area."
 msgstr "选择以下载选定下载区域中的 GPS 轨迹。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:127
 msgid "Download as new layer"
 msgstr "下载为新图层"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:128
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
@@ -10951,29 +10970,29 @@
 "层。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:200
 msgid "No area selected yet"
 msgstr "尚未选定区域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:203
 msgid "Download area too large; will probably be rejected by server"
 msgstr "下载区域太大；可能会被服务器拒绝"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
 msgid "Download area ok, size probably acceptable to server"
 msgstr "下载区域合适，大小应该会被服务器接受"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:359
 msgid "Click to close the dialog and to abort downloading"
 msgstr "点击以关闭此对话框，并放弃下载"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
 msgid "Click to download the currently selected area"
 msgstr "点击以下载目前选定的区域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:383
 msgid "Please select a download area first."
 msgstr "请先选择下载区域。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
 #, java-format
 msgid ""
@@ -11062,12 +11081,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: build/specialmessages.java:84 build/trans_presets.java:480
-#: build/trans_presets.java:787 build/trans_presets.java:796
-#: build/trans_presets.java:1200 build/trans_presets.java:1580
-#: build/trans_presets.java:1692 build/trans_presets.java:2447
-#: build/trans_presets.java:2682 build/trans_presets.java:2726
-#: build/trans_presets.java:2954 build/trans_presets.java:2963
-#: build/trans_presets.java:3123 build/trans_presets.java:3239
-#: build/trans_presets.java:3999 build/trans_presets.java:4009
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:799 build/trans_presets.java:808
+#: build/trans_presets.java:1212 build/trans_presets.java:1592
+#: build/trans_presets.java:1705 build/trans_presets.java:2460
+#: build/trans_presets.java:2695 build/trans_presets.java:2739
+#: build/trans_presets.java:2967 build/trans_presets.java:2976
+#: build/trans_presets.java:3136 build/trans_presets.java:3252
+#: build/trans_presets.java:4012 build/trans_presets.java:4022
+#: build/trans_presets.java:4031
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -11087,5 +11106,5 @@
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr "读取 CSS 文件“help-browser.css”失败。例外为：{0}"
+msgstr "读取 CSS 文件“help-browser.css”失败。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:180
@@ -11120,5 +11139,5 @@
 msgstr ""
 "<html><p class=\"error-header\">在取得帮助信息时发生错误</p><p class=\"error-"
-"body\">无法载入帮助主题 <strong>{0}</strong> 的内容。错误信息为(未翻译)："
+"body\">无法加载帮助主题 <strong>{0}</strong> 的内容。错误信息为(未翻译)："
 "<br><tt>{1}</tt></p></html>"
 
@@ -11158,5 +11177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:434
 msgid "Reload the current help page"
-msgstr "重新载入目前的说明页面"
+msgstr "重新加载目前的说明页面"
 
 #. putValue(NAME, tr("Back"));
@@ -11179,5 +11198,5 @@
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "警告：在 HTML 文件中有错误的位置。例外为：{0}"
+msgstr "警告：在 HTML 文件中有错误的位置。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566
@@ -11218,5 +11237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
-msgstr "重新载入服务器的历史记录"
+msgstr "重新加载服务器的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
@@ -11251,20 +11270,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
-msgstr "载入历史记录"
+msgstr "加载历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
-msgstr "正在载入节点 {0} 的历史记录"
+msgstr "正在加载节点 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr "正在载入路径 {0} 的历史记录"
+msgstr "正在加载路径 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr "正在载入关系 {0} 的历史记录"
+msgstr "正在加载关系 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -11307,5 +11326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "Changeset:"
-msgstr ""
+msgstr "修改集合："
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11541,5 +11560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:302
 msgid "Load the list of your open changesets from the server"
-msgstr "从服务器载入您的开放修改集合列表"
+msgstr "从服务器加载您的开放修改集合列表"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:320
@@ -11576,27 +11595,27 @@
 msgstr "正在关闭修改集合 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:103
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
 "exception."
-msgstr "警告：无法将凭证对话框永远置于最上层。抓到安全性例外。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:108
+msgstr "警告：无法将凭证对话框永远置于最上层。抓到安全性异常。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:109
 msgid "Enter credentials for OSM API"
 msgstr "输入 OSM API 的凭证"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:116
 msgid "Enter credentials for HTTP proxy"
 msgstr "输入 HTTP 代理服务器所需凭证"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the user name of your OSM account"
 msgstr "请输入您 OSM 帐号的用户名"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:246
 msgid "Please enter the password of your OSM account"
 msgstr "请输入您 OSM 帐号的密码"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:248
 #, java-format
 msgid ""
@@ -11605,17 +11624,17 @@
 msgstr "在 OSM API“{0}”验证失败。请输入有效的用户名和密码。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:250
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告：密码是以未加密的方式传输。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr "请输入您的代理服务器验证用的用户名"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:264
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr "请输入您的代理服务器验证用的密码"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:266
 #, java-format
 msgid ""
@@ -11624,5 +11643,5 @@
 msgstr "在 HTTP 代理服务器“{0}”验证失败。请输入有效的用户名和密码。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:268
 msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
@@ -11632,13 +11651,13 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate"
 msgstr "验证"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:335
 msgid "Authenticate with the supplied username and password"
 msgstr "以指定的用户名和密码进行验证"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:349
 msgid "Cancel authentication"
 msgstr "取消验证"
@@ -11663,5 +11682,5 @@
 "Warning: Failed to retrieve user infos for the current JOSM user. Exception "
 "was: {0}"
-msgstr "警告：无法取得目前的 JOSM 用户信息。例外为：{0}"
+msgstr "警告：无法取得目前的 JOSM 用户信息。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:53
@@ -11865,5 +11884,5 @@
 "canceled or have failed.</html>"
 msgstr[0] ""
-msgstr[1] ""
+"<html>上载和/或保存对 {0} 个有修改图层的操作<br>已取消或失败。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -11922,10 +11941,10 @@
 #: build/trans_presets.java:504 build/trans_presets.java:520
 #: build/trans_presets.java:545 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:629
-#: build/trans_presets.java:653 build/trans_presets.java:678
-#: build/trans_presets.java:698 build/trans_presets.java:719
-#: build/trans_presets.java:1074 build/trans_presets.java:1082
-#: build/trans_presets.java:1090 build/trans_presets.java:1098
-#: build/trans_presets.java:1109 build/trans_presets.java:1386
+#: build/trans_presets.java:606 build/trans_presets.java:641
+#: build/trans_presets.java:665 build/trans_presets.java:690
+#: build/trans_presets.java:710 build/trans_presets.java:731
+#: build/trans_presets.java:1086 build/trans_presets.java:1094
+#: build/trans_presets.java:1102 build/trans_presets.java:1110
+#: build/trans_presets.java:1121 build/trans_presets.java:1398
 msgid "Layer"
 msgstr "层"
@@ -12233,5 +12252,5 @@
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "忽略捕捉到的例外，因为上传已被取消。例外为：{0}"
+msgstr "忽略捕捉到的异常，因为上传已被取消。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
@@ -12421,5 +12440,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
-#: build/trans_presets.java:4321 build/trans_presets.java:4351
+#: build/trans_presets.java:4334 build/trans_presets.java:4364
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -12510,5 +12529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
 msgid "Choose visible tracks"
-msgstr ""
+msgstr "选择可见的轨迹"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:986
@@ -12518,17 +12537,19 @@
 "updated live in the background. Open the URLs by double clicking them.</html>"
 msgstr ""
+"<html>选择您想要显示的所有轨迹。您可以拖动选择一个轨迹的范围，或使用 Ctrl+单"
+"击选择特定的。地图会在在后台实时更新。双击网址以打开它们。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1004
 #, java-format
 msgid "Set track visibility for {0}"
-msgstr ""
+msgstr "为 {0} 设置轨迹可见性"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 msgid "Show all"
-msgstr ""
+msgstr "显示所有"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 msgid "Show selected only"
-msgstr ""
+msgstr "只显示选定的"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1052
@@ -12591,5 +12612,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1158
 msgid "Calculating Download Area"
-msgstr ""
+msgstr "计算下载区域"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1262
@@ -12625,5 +12646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1714
 msgid "Customize track drawing"
-msgstr ""
+msgstr "自定义轨迹绘制"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1731
@@ -12804,9 +12825,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372
 msgid "Show Errors"
-msgstr ""
+msgstr "显示错误"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
 msgid "Load Tile"
-msgstr "载入拼贴"
+msgstr "加载拼贴"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:392
@@ -12816,9 +12837,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415
 msgid "Load All Tiles"
-msgstr "载入所有拼贴"
+msgstr "加载所有拼贴"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
 msgid "Load All Error Tiles"
-msgstr ""
+msgstr "加载所有错误的拼贴"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434
@@ -12921,5 +12942,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:632
 msgid "Reload erroneous tiles"
-msgstr "重新载入错误的拼贴"
+msgstr "重新加载错误的拼贴"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:653
@@ -12937,9 +12958,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713
 msgid "Load WMS layer from file"
-msgstr "从文件载入 WMS 图层"
+msgstr "从文件加载 WMS 图层"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718
 msgid "Load WMS layer"
-msgstr "载入 WMS 图层"
+msgstr "加载 WMS 图层"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729
@@ -12954,5 +12975,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:767
 msgid "Error loading file"
-msgstr "载入文件有错误"
+msgstr "加载文件有错误"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
@@ -12984,5 +13005,5 @@
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "文件 {0} 已经以“{1}”的名称载入了。"
+msgstr "文件 {0} 已经以“{1}”的名称加载了。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
@@ -13048,5 +13069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
 msgid "<No GPX track loaded yet>"
-msgstr "<尚未载入 GPX 轨迹>"
+msgstr "<尚未加载 GPX 轨迹>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:482
@@ -13267,5 +13288,5 @@
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "已载入 {0} 张图片。"
+msgstr[0] "已加载 {0} 张图片。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
@@ -13299,5 +13320,5 @@
 #, java-format
 msgid "Loading {0}"
-msgstr "正在载入 {0}"
+msgstr "正在加载 {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:491
@@ -13482,10 +13503,10 @@
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告：从“{0}”载入 Mappaint 样式失败。例外为：{1}"
+msgstr "警告：从“{0}”加载 Mappaint 样式失败。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:260
 #, java-format
 msgid "loading style ''{0}''..."
-msgstr "载入样式“{0}”中..."
+msgstr "加载样式“{0}”中..."
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java:98
@@ -13532,5 +13553,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:242
 msgid "Access Token Secret:"
-msgstr "访问令牌机密："
+msgstr "访问令牌密码："
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
@@ -13552,9 +13573,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr "用户令牌键："
+msgstr "用户键："
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr "用户机密："
+msgstr "用户密码："
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
@@ -13817,5 +13838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
-msgstr "请输入访问令牌机密"
+msgstr "请输入访问令牌密码"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -13823,5 +13844,5 @@
 "The Access Token Secret must not be empty. Please enter an Access Token "
 "Secret"
-msgstr "访问令牌机密不能为空白。请输入访问令牌机密"
+msgstr "访问令牌密码不能为空白。请输入访问令牌密码"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
@@ -14256,13 +14277,13 @@
 msgstr "默认值目前不明(设定值尚未使用)。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:241
 msgid "Enter a new key/value pair"
 msgstr "输入新的设定键/数值配对"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:263
 msgid "Change a key/value pair"
 msgstr "改变设定键/数值对"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:281
 msgid "Values"
 msgstr "值"
@@ -14561,9 +14582,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Everything"
-msgstr ""
+msgstr "所有"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Name or offset"
-msgstr ""
+msgstr "名称或偏移"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
@@ -14577,5 +14598,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Custom"
-msgstr ""
+msgstr "自定义"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
@@ -14626,5 +14647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
+msgstr "轨迹日期"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
@@ -14635,5 +14656,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1584
 msgid "Car"
 msgstr "汽车"
@@ -14660,13 +14681,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:452 build/trans_presets.java:579
-#: build/trans_presets.java:858 build/trans_presets.java:868
-#: build/trans_presets.java:877 build/trans_presets.java:889
-#: build/trans_presets.java:903 build/trans_presets.java:925
-#: build/trans_presets.java:968 build/trans_presets.java:981
-#: build/trans_presets.java:993 build/trans_presets.java:1005
-#: build/trans_presets.java:1017 build/trans_presets.java:1029
-#: build/trans_presets.java:1039 build/trans_presets.java:1048
-#: build/trans_presets.java:1057 build/trans_presets.java:1718
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:870 build/trans_presets.java:880
+#: build/trans_presets.java:889 build/trans_presets.java:901
+#: build/trans_presets.java:915 build/trans_presets.java:937
+#: build/trans_presets.java:980 build/trans_presets.java:993
+#: build/trans_presets.java:1005 build/trans_presets.java:1017
+#: build/trans_presets.java:1029 build/trans_presets.java:1041
+#: build/trans_presets.java:1051 build/trans_presets.java:1060
+#: build/trans_presets.java:1069 build/trans_presets.java:1731
+#: build/trans_presets.java:1811
 msgid "Bicycle"
 msgstr "单车"
@@ -14706,12 +14727,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:448 build/trans_presets.java:578
-#: build/trans_presets.java:857 build/trans_presets.java:867
-#: build/trans_presets.java:876 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:967 build/trans_presets.java:980
-#: build/trans_presets.java:992 build/trans_presets.java:1004
-#: build/trans_presets.java:1016 build/trans_presets.java:1028
-#: build/trans_presets.java:1038 build/trans_presets.java:1047
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:869 build/trans_presets.java:879
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:914 build/trans_presets.java:936
+#: build/trans_presets.java:979 build/trans_presets.java:992
+#: build/trans_presets.java:1004 build/trans_presets.java:1016
+#: build/trans_presets.java:1028 build/trans_presets.java:1040
+#: build/trans_presets.java:1050 build/trans_presets.java:1059
+#: build/trans_presets.java:1068
 msgid "Foot"
 msgstr "步行"
@@ -14801,5 +14822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
-msgstr "依速度来为点和轨迹区段上色。"
+msgstr "依速度为点和轨迹区段上色。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
@@ -14811,9 +14832,9 @@
 "Colors points and track segments by dilution of position (HDOP). Your "
 "capture device needs to log that information."
-msgstr "为地点精度 (HDOP) 的点和轨迹区段上色。您的捕获设备需要能记录这项信息。"
+msgstr "依位置精度(HDOP)为点和轨迹区段上色。您的捕获设备需要能记录这项信息。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
-msgstr ""
+msgstr "依时间戳为点和轨迹区段上色。"
 
 #. color Tracks by Velocity Tune
@@ -14824,9 +14845,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
-msgstr "轨迹与点的颜色"
+msgstr "轨迹和点的颜色"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
-msgstr ""
+msgstr "依数据范围为点和轨迹区段上色。"
 
 #. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
@@ -14839,20 +14860,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
 msgid "Audio waypoint labelling"
-msgstr ""
+msgstr "音频路点标签"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
 #, java-format
 msgid "Incorrect waypoint label pattern: {0}"
-msgstr ""
+msgstr "不正确的路点标签模式：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
 msgid "Incorrect pattern"
-msgstr ""
+msgstr "不正确的模式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
 #, java-format
 msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr ""
+msgstr "不正确的音频路点标签模式：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -14910,5 +14931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202
 msgid "Autoload tiles by default: "
-msgstr "默认情况下，自动载入拼贴： "
+msgstr "默认情况下，自动加载拼贴： "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
@@ -15109,10 +15130,10 @@
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr "从“{0}”重新载入可用的样式列表"
+msgstr "从“{0}”重新加载可用的样式列表"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:127
 #, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "正在从“{0}”载入样式来源"
+msgstr "正在从“{0}”加载样式来源"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:129
@@ -15122,5 +15143,5 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>无法从这里载入样式来源列表：<br>“{0}”。<br><br>详细数据 (未翻译)：<br>"
+"<html>无法从这里加载样式来源列表：<br>“{0}”。<br><br>详细数据 (未翻译)：<br>"
 "{1}</html>"
 
@@ -15530,4 +15551,6 @@
 "JOSM."
 msgstr ""
+"JOSM 将总是监听本地主机上的端口 8111。此端口是不可配置的，因为它被需要与 "
+"JOSM 通讯的外部应用程序所参考。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15663,5 +15686,5 @@
 "table></html>"
 msgstr ""
-"<html>标签预设组合来源 {0} 可以载入，但是它包含错误。您是否确定要使用它？"
+"<html>标签预设组合来源 {0} 可以加载，但是它包含错误。您是否确定要使用它？"
 "<br><br><table width=600>错误为：[{1}：{2}] {3}</table></html>"
 
@@ -15681,5 +15704,5 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-"<html>标签预设组合来源 {0} 可以载入，但是它包含错误。您是否确定要使用它？"
+"<html>标签预设组合来源 {0} 可以加载，但是它包含错误。您是否确定要使用它？"
 "<br><br><table width=600>错误为：{1}</table></html>"
 
@@ -15732,10 +15755,10 @@
 #, java-format
 msgid "Reloads the list of available presets from ''{0}''"
-msgstr "从“{0}”重新载入可用的预设组合列表"
+msgstr "从“{0}”重新加载可用的预设组合列表"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:227
 #, java-format
 msgid "Loading preset sources from ''{0}''"
-msgstr "从“{0}”载入预设组合来源"
+msgstr "从“{0}”加载预设组合来源"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229
@@ -15904,5 +15927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
 msgid "Always update without asking"
-msgstr ""
+msgstr "总是不询问就更新"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16334,21 +16357,21 @@
 msgstr "搜索关键字"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:68
 msgid "Min. latitude"
 msgstr "最小纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:70
 msgid "Min. longitude"
 msgstr "最小经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:72
 msgid "Max. latitude"
 msgstr "最大纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:74
 msgid "Max. longitude"
 msgstr "最大经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:84
 msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
@@ -16484,5 +16507,5 @@
 msgid ""
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "错误：以代理服务器“{0}”连接到 URI“{1}”失败。例外为：{2}"
+msgstr "错误：以代理服务器“{0}”连接到 URI“{1}”失败。异常为：{2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
@@ -16611,5 +16634,5 @@
 "Error occurred while parsing gpx file {0}. Only a part of the file will be "
 "available."
-msgstr ""
+msgstr "解析 GPX 文件 {0} 时发生错误。只有文件的一部分将可用。"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16664,5 +16687,5 @@
 "zip file ''{0}''. Exception was: {1}"
 msgstr ""
-"警告：无法开启 zip 文件“{0}”中扩展名为“{2}”、名称为“{3}”的文件。例外为：{1}"
+"警告：无法开启 zip 文件“{0}”中扩展名为“{2}”、名称为“{3}”的文件。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:242
@@ -16683,18 +16706,20 @@
 "header. Can''t redirect. Aborting."
 msgstr ""
+"HTTP 服务器回应意外。得到了没有“Location”头的 {0} 响应。无法重定向。正在中"
+"止。"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:307
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "检测到下载网址 URL 重定向过多。正在中止。"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:310
 #, java-format
 msgid "Download redirected to ''{0}''"
-msgstr ""
+msgstr "下载重定向到“{0}”"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:313
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
-msgstr ""
+msgstr "无法从“{0}”读取。服务器回应状态代码 {1}。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -16932,5 +16957,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
 msgid "Prolog of OsmChange document not written yet. Please write first."
-msgstr ""
+msgstr "OsmChange 文件的序言尚未写入。请先写入。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17104,5 +17129,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
 msgid "OSM Server Files"
 msgstr "OSM 服务器文件"
@@ -17123,5 +17148,5 @@
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr "无法备份文件。例外为：{0}"
+msgstr "无法备份文件。异常为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -17134,5 +17159,5 @@
 msgstr "正在分析 OSM 历史记录数据 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java:40
 #, java-format
@@ -17140,4 +17165,13 @@
 msgstr "文件“{0}”不存在"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+#, java-format
+msgid "No data found in file {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+msgid "Open OSM file"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170
@@ -17147,4 +17181,6 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
+"元素上缺少强制属性“bounds”。得到 minlon=''{0}'',minlat=''{1}'',"
+"maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17222,5 +17258,5 @@
 msgstr "标签中缺少设定键或数值属性。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
@@ -17229,5 +17265,5 @@
 msgstr "在输入串流中发现未定义的元素“{0}”。正在跳过。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
@@ -17235,6 +17271,6 @@
 msgstr "不合法的对象，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -17247,8 +17283,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
@@ -17263,5 +17299,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
@@ -17269,5 +17305,5 @@
 msgstr "不明或不支持的 API 版本。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
@@ -17276,6 +17312,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
@@ -17289,6 +17325,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
@@ -17299,5 +17335,5 @@
 msgstr "属性“changeset”有不合法的数值。得到“{0}”。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
@@ -17306,5 +17342,5 @@
 msgstr "缺少必要的属性“{0}”。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
@@ -17313,5 +17349,5 @@
 msgstr "属性“{0}”有不合法的 long 数值。得到“{1}”。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
 #, java-format
@@ -17320,5 +17356,5 @@
 msgstr "外部 ID“{0}”的路径包含了缺少的外部 ID“{1}”的节点。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
 #, java-format
@@ -17326,5 +17362,5 @@
 msgstr "删除的节点 {0} 是路径 {1} 的一部分"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
 #, java-format
@@ -17333,8 +17369,8 @@
 "missing in the loaded data."
 msgstr ""
-"有 {1} 个节点的路径 {0} 有不完整的节点，因为在载入的数据中至少有一个节点遗失"
+"有 {1} 个节点的路径 {0} 有不完整的节点，因为在加载的数据中至少有一个节点遗失"
 "了。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
 #, java-format
@@ -17344,5 +17380,5 @@
 msgstr "外部 id“{0}”的关系包含了缺少的外部 id“{1}”的原型。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
 #, java-format
@@ -17350,17 +17386,17 @@
 msgstr "删除的成员 {0} 正由关系 {1} 使用"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Prepare OSM data..."
 msgstr "准备 OSM 数据..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
 msgid "Parsing OSM data..."
 msgstr "正在分析 OSM 数据..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
 msgid "Preparing data set..."
 msgstr "正在准备数据集合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
@@ -17540,5 +17576,5 @@
 "Warning: Could not detect type of imagery source ''{0}''. Using default "
 "(xml)."
-msgstr ""
+msgstr "警告：无法检测到图像源“{0}”的类型。正在使用默认(XML)。"
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -17604,5 +17640,5 @@
 "Remote Control has been asked to load an imagery layer from the following "
 "URL:"
-msgstr "远程控制被要求从下列 URL 载入图片图层："
+msgstr "远程控制被要求从下列 URL 加载图片图层："
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:48
@@ -17712,5 +17748,5 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>已要求载入插件“{0}”。<br>这个插件已不再开发，并且很有可能产生问题。<br>"
+"<html>已要求加载插件“{0}”。<br>这个插件已不再开发，并且很有可能产生问题。<br>"
 "它应该被停用。<br>是否从首选项中删除？</html>"
 
@@ -17791,10 +17827,10 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "无法载入插件 {0}。是否从首选项中删除？"
+msgstr "无法加载插件 {0}。是否从首选项中删除？"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:475
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
-msgstr "正在载入插件“{0}”(版本 {1})"
+msgstr "正在加载插件“{0}”(版本 {1})"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
@@ -17809,5 +17845,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505
 msgid "Loading plugins ..."
-msgstr "正在载入插件..."
+msgstr "正在加载插件..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:506
@@ -17818,5 +17854,5 @@
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr "正在载入插件“{0}”..."
+msgstr "正在加载插件“{0}”..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:614
@@ -17828,9 +17864,9 @@
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] "这个插件将不会被载入。"
+msgstr[0] "这个插件将不会被加载。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
 msgid "Determine plugins to load..."
-msgstr "决定要载入的插件..."
+msgstr "决定要加载的插件..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:654
@@ -17899,5 +17935,5 @@
 "installation. JOSM is still going to load the old plugin version."
 msgstr ""
-"警告：无法安装已下载的插件“{0}”。正在跳过安装。JOSM 仍然会载入旧的插件版本。"
+"警告：无法安装已下载的插件“{0}”。正在跳过安装。JOSM 仍然会加载旧的插件版本。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889
@@ -17917,5 +17953,5 @@
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "发生意想不到的例外，可能来自“{0}”插件。"
+msgstr "发生意想不到的异常，可能来自“{0}”插件。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:917
@@ -18047,5 +18083,5 @@
 "Failed to parse plugin list document from site ''{0}''. Skipping site. "
 "Exception was: {1}"
-msgstr "无法解析网站“{0}”的插件列表文件。正在跳过网站。例外为：{1}"
+msgstr "无法解析网站“{0}”的插件列表文件。正在跳过网站。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:348
@@ -18068,13 +18104,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Report Bug"
 msgstr "回复程序错误"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -18082,12 +18118,12 @@
 "file a bug report."
 msgstr ""
-"发生意想不到的例外。<br>这通常是程序码的错误。如果您使用的是最新版的"
+"发生意想不到的异常。<br>这通常是程序码的错误。如果您使用的是最新版的"
 "<br>JOSM，请考虑不吝回复错误。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "Unexpected Exception"
-msgstr "意想不到的例外"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
+msgstr "意想不到的异常"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:109
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -18096,5 +18132,5 @@
 "您遇到了 JOSM 的错误。在您回复错误之前，请确定您已更新到在这里最新版的 JOSM："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:118
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:113
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -18104,5 +18140,5 @@
 "误："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -18113,5 +18149,5 @@
 "一些。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -18119,9 +18155,9 @@
 msgstr "另外，如果这些都不行，您也可以在这个 URL 自行填写信息："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(该文字已复制到您的剪贴板中。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:139
 msgid "You have encountered a bug in JOSM"
 msgstr "您遇到了 JOSM 的程序错误"
@@ -18155,5 +18191,5 @@
 msgstr ""
 "<html><strong>无法</strong>删除<strong>关系 {0}</strong>。它仍然被关系 {1} 参"
-"照。<br>请载入关系 {1}，删除对关系 {0} 的参照，并再上传一次。</html>"
+"照。<br>请加载关系 {1}，删除对关系 {0} 的参照，并再上传一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:106
@@ -18284,5 +18320,5 @@
 msgstr ""
 "<html>基于安全性的理由无法连接到远程服务器<br>“{0}”。<br>这大部分是因为您以 "
-"applet 执行<br>以及您没有从“{1}”载入 applet。</html>"
+"applet 执行<br>以及您没有从“{1}”加载 applet。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -18374,5 +18410,5 @@
 "<br><br>错误的信息为：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -18392,5 +18428,5 @@
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "警告：无法处理 zip 文件“{0}”。例外为：{1}"
+msgstr "警告：无法处理 zip 文件“{0}”。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:340
@@ -18400,5 +18436,5 @@
 "Warning: failed to access directory ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告：基于安全性理由无法访问目录“{0}”。例外为：{1}"
+msgstr "警告：基于安全性理由无法访问目录“{0}”。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:27
@@ -18465,5 +18501,5 @@
 #, java-format
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
-msgstr "警告：无法从“{0}”读取 MOTD。例外为：{1}"
+msgstr "警告：无法从“{0}”读取 MOTD。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
@@ -18473,5 +18509,5 @@
 "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告：基于安全性理由无法从“{0}”读取 MOTD。例外为：{1}"
+msgstr "警告：基于安全性理由无法从“{0}”读取 MOTD。异常为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -18497,5 +18533,5 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"无法解析首选项的设定键“{0}”的栏位“{1}”。例外为：{2}。不能从首选项中恢复窗口位"
+"无法解析首选项的设定键“{0}”的栏位“{1}”。异常为：{2}。不能从首选项中恢复窗口位"
 "置大小。"
 
@@ -18509,19 +18545,19 @@
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:350
 msgid "Failed to load XML schema."
-msgstr "无法载入 XML 架构。"
+msgstr "无法加载 XML 架构。"
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
 #, java-format
 msgid "Unexpected token ({0}) on position {1}"
-msgstr ""
+msgstr "异常的位于 {1} 的标记({0})"
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
 #, java-format
 msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr ""
+msgstr "异常的位于 {0} 的标记。预期 {1}，发现 {2}"
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
 msgid "Error while parsing search expression"
-msgstr ""
+msgstr "解析搜索表达式时出错"
 
 #. *
@@ -19098,5 +19134,5 @@
 #: build/trans_plugins.java:47
 msgid "Allows to filter out unnecessary GPS tracks"
-msgstr ""
+msgstr "允许您过滤掉不必要的 GPS 轨迹"
 
 #. Plugin graphview
@@ -19207,7 +19243,6 @@
 #. Plugin multipoly-convert
 #: build/trans_plugins.java:83
-#, fuzzy
 msgid "Simply convert an area to a multipolygon."
-msgstr "转换为多重多边形。"
+msgstr "简单地用多重多边形覆盖一个区域。"
 
 #. Plugin namemanager
@@ -19623,9 +19658,9 @@
 #: build/trans_presets.java:173 build/trans_presets.java:194
 #: build/trans_presets.java:236 build/trans_presets.java:258
-#: build/trans_presets.java:1875 build/trans_presets.java:1883
-#: build/trans_presets.java:1891 build/trans_presets.java:1925
-#: build/trans_presets.java:2730 build/trans_presets.java:3271
-#: build/trans_presets.java:3287 build/trans_presets.java:4319
-#: build/trans_presets.java:4349
+#: build/trans_presets.java:1888 build/trans_presets.java:1896
+#: build/trans_presets.java:1904 build/trans_presets.java:1938
+#: build/trans_presets.java:2743 build/trans_presets.java:3284
+#: build/trans_presets.java:3300 build/trans_presets.java:4332
+#: build/trans_presets.java:4362
 msgid "Reference"
 msgstr "编号"
@@ -19679,5 +19714,5 @@
 #: build/trans_presets.java:505 build/trans_presets.java:521
 #: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1400
 msgid "Max. speed (km/h)"
 msgstr "限速(km/h)"
@@ -19711,4 +19746,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Cycle Lane" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
@@ -19727,6 +19763,7 @@
 #: build/trans_presets.java:544 build/trans_presets.java:577
 #: build/trans_presets.java:600 build/trans_presets.java:622
-#: build/trans_presets.java:647 build/trans_presets.java:671
-#: build/trans_presets.java:713 build/trans_presets.java:1381
+#: build/trans_presets.java:634 build/trans_presets.java:659
+#: build/trans_presets.java:683 build/trans_presets.java:725
+#: build/trans_presets.java:1393
 msgid "Oneway"
 msgstr "单行道"
@@ -19777,8 +19814,8 @@
 #: build/trans_presets.java:494 build/trans_presets.java:501
 #: build/trans_presets.java:539 build/trans_presets.java:572
-#: build/trans_presets.java:601 build/trans_presets.java:623
-#: build/trans_presets.java:648 build/trans_presets.java:672
-#: build/trans_presets.java:692 build/trans_presets.java:714
-#: build/trans_presets.java:1382 build/trans_surveyor.java:12
+#: build/trans_presets.java:601 build/trans_presets.java:635
+#: build/trans_presets.java:660 build/trans_presets.java:684
+#: build/trans_presets.java:704 build/trans_presets.java:726
+#: build/trans_presets.java:1394 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "桥"
@@ -19821,7 +19858,7 @@
 #: build/trans_presets.java:511 build/trans_presets.java:540
 #: build/trans_presets.java:573 build/trans_presets.java:602
-#: build/trans_presets.java:624 build/trans_presets.java:649
-#: build/trans_presets.java:673 build/trans_presets.java:693
-#: build/trans_presets.java:715 build/trans_presets.java:1383
+#: build/trans_presets.java:636 build/trans_presets.java:661
+#: build/trans_presets.java:685 build/trans_presets.java:705
+#: build/trans_presets.java:727 build/trans_presets.java:1395
 msgid "Tunnel"
 msgstr "隧道"
@@ -19861,8 +19898,8 @@
 #: build/trans_presets.java:427 build/trans_presets.java:486
 #: build/trans_presets.java:541 build/trans_presets.java:574
-#: build/trans_presets.java:603 build/trans_presets.java:625
-#: build/trans_presets.java:650 build/trans_presets.java:674
-#: build/trans_presets.java:694 build/trans_presets.java:716
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:603 build/trans_presets.java:637
+#: build/trans_presets.java:662 build/trans_presets.java:686
+#: build/trans_presets.java:706 build/trans_presets.java:728
+#: build/trans_presets.java:1396
 msgid "Cutting"
 msgstr "断开"
@@ -19902,8 +19939,8 @@
 #: build/trans_presets.java:428 build/trans_presets.java:487
 #: build/trans_presets.java:542 build/trans_presets.java:575
-#: build/trans_presets.java:604 build/trans_presets.java:626
-#: build/trans_presets.java:651 build/trans_presets.java:675
-#: build/trans_presets.java:695 build/trans_presets.java:717
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:604 build/trans_presets.java:638
+#: build/trans_presets.java:663 build/trans_presets.java:687
+#: build/trans_presets.java:707 build/trans_presets.java:729
+#: build/trans_presets.java:1397
 msgid "Embankment"
 msgstr "堤防"
@@ -19943,8 +19980,8 @@
 #: build/trans_presets.java:408 build/trans_presets.java:429
 #: build/trans_presets.java:543 build/trans_presets.java:576
-#: build/trans_presets.java:605 build/trans_presets.java:627
-#: build/trans_presets.java:652 build/trans_presets.java:676
-#: build/trans_presets.java:696 build/trans_presets.java:718
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:605 build/trans_presets.java:639
+#: build/trans_presets.java:664 build/trans_presets.java:688
+#: build/trans_presets.java:708 build/trans_presets.java:730
+#: build/trans_presets.java:2352
 msgid "Lit"
 msgstr "路灯"
@@ -20046,9 +20083,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "Incline"
-msgstr "坡"
+msgstr "坡度"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20082,9 +20119,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20118,9 +20155,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10%"
-msgstr ""
+msgstr "-10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20154,9 +20191,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10°"
-msgstr ""
+msgstr "-10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20190,9 +20227,9 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10°"
-msgstr ""
+msgstr "-10%"
 
 #. </optional>
@@ -20263,5 +20300,5 @@
 #. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:288 build/trans_presets.java:373
-#: build/trans_presets.java:677 build/trans_presets.java:697
+#: build/trans_presets.java:689 build/trans_presets.java:709
 msgid "Passing Places"
 msgstr "让车区"
@@ -20294,9 +20331,9 @@
 #: build/trans_presets.java:507 build/trans_presets.java:522
 #: build/trans_presets.java:550 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:630
-#: build/trans_presets.java:654 build/trans_presets.java:679
-#: build/trans_presets.java:699 build/trans_presets.java:720
-#: build/trans_presets.java:1389 build/trans_presets.java:1786
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:608 build/trans_presets.java:642
+#: build/trans_presets.java:666 build/trans_presets.java:691
+#: build/trans_presets.java:711 build/trans_presets.java:732
+#: build/trans_presets.java:1401 build/trans_presets.java:1799
+#: build/trans_presets.java:1844
 msgid "Width (meters)"
 msgstr "宽度 (米)"
@@ -20340,7 +20377,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "Surface"
 msgstr "路面"
@@ -20367,7 +20404,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "paved"
 msgstr "有铺面的"
@@ -20392,8 +20429,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "unpaved"
 msgstr "没铺面的"
@@ -20418,8 +20455,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "asphalt"
 msgstr "柏油"
@@ -20446,7 +20483,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "concrete"
 msgstr "水泥地"
@@ -20472,8 +20509,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2707
 msgid "metal"
 msgstr "金属"
@@ -20500,9 +20537,9 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2384
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2397
+#: build/trans_presets.java:2707
 msgid "wood"
 msgstr "木头"
@@ -20527,8 +20564,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "paving_stones"
 msgstr "铺路石"
@@ -20555,7 +20592,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "cobblestone"
 msgstr "石子路"
@@ -20582,7 +20619,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "gravel"
 msgstr "碎石路"
@@ -20607,8 +20644,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "pebblestone"
 msgstr "鹅卵石"
@@ -20633,8 +20670,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "compacted"
 msgstr "压实的"
@@ -20659,8 +20696,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "grass_paver"
 msgstr "草地_铺面"
@@ -20687,7 +20724,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "grass"
 msgstr "草地"
@@ -20714,7 +20751,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "sand"
 msgstr "沙地"
@@ -20742,8 +20779,8 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:2676
 msgid "ground"
 msgstr "地面"
@@ -21051,59 +21088,59 @@
 #: build/trans_presets.java:580 build/trans_presets.java:581
 #: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:628
-#: build/trans_presets.java:796 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1585 build/trans_presets.java:1586
-#: build/trans_presets.java:1587 build/trans_presets.java:1602
-#: build/trans_presets.java:1693 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1707
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
-#: build/trans_presets.java:1820 build/trans_presets.java:1821
-#: build/trans_presets.java:1822 build/trans_presets.java:1940
-#: build/trans_presets.java:1941 build/trans_presets.java:1942
-#: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:1959 build/trans_presets.java:1960
-#: build/trans_presets.java:1961 build/trans_presets.java:1974
-#: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1991
-#: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:1994 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2026
-#: build/trans_presets.java:2027 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2043
-#: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2049
-#: build/trans_presets.java:2065 build/trans_presets.java:2066
-#: build/trans_presets.java:2067 build/trans_presets.java:2068
-#: build/trans_presets.java:2088 build/trans_presets.java:2089
-#: build/trans_presets.java:2090 build/trans_presets.java:2091
-#: build/trans_presets.java:2107 build/trans_presets.java:2108
-#: build/trans_presets.java:2109 build/trans_presets.java:2110
-#: build/trans_presets.java:2124 build/trans_presets.java:2125
-#: build/trans_presets.java:2126 build/trans_presets.java:2127
-#: build/trans_presets.java:2143 build/trans_presets.java:2144
-#: build/trans_presets.java:2145 build/trans_presets.java:2146
-#: build/trans_presets.java:2162 build/trans_presets.java:2163
-#: build/trans_presets.java:2164 build/trans_presets.java:2165
-#: build/trans_presets.java:2178 build/trans_presets.java:2179
-#: build/trans_presets.java:2180 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2196
-#: build/trans_presets.java:2197 build/trans_presets.java:2198
-#: build/trans_presets.java:2212 build/trans_presets.java:2213
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2362 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:584 build/trans_presets.java:640
+#: build/trans_presets.java:808 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1593 build/trans_presets.java:1594
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:1599 build/trans_presets.java:1614
+#: build/trans_presets.java:1706 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1833 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1953
+#: build/trans_presets.java:1954 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1974 build/trans_presets.java:1987
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:2004
+#: build/trans_presets.java:2005 build/trans_presets.java:2006
+#: build/trans_presets.java:2007 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2039
+#: build/trans_presets.java:2040 build/trans_presets.java:2041
+#: build/trans_presets.java:2042 build/trans_presets.java:2056
+#: build/trans_presets.java:2057 build/trans_presets.java:2058
+#: build/trans_presets.java:2059 build/trans_presets.java:2062
+#: build/trans_presets.java:2078 build/trans_presets.java:2079
+#: build/trans_presets.java:2080 build/trans_presets.java:2081
+#: build/trans_presets.java:2101 build/trans_presets.java:2102
+#: build/trans_presets.java:2103 build/trans_presets.java:2104
+#: build/trans_presets.java:2120 build/trans_presets.java:2121
+#: build/trans_presets.java:2122 build/trans_presets.java:2123
+#: build/trans_presets.java:2137 build/trans_presets.java:2138
+#: build/trans_presets.java:2139 build/trans_presets.java:2140
+#: build/trans_presets.java:2156 build/trans_presets.java:2157
+#: build/trans_presets.java:2158 build/trans_presets.java:2159
+#: build/trans_presets.java:2175 build/trans_presets.java:2176
+#: build/trans_presets.java:2177 build/trans_presets.java:2178
+#: build/trans_presets.java:2191 build/trans_presets.java:2192
+#: build/trans_presets.java:2193 build/trans_presets.java:2194
+#: build/trans_presets.java:2208 build/trans_presets.java:2209
+#: build/trans_presets.java:2210 build/trans_presets.java:2211
+#: build/trans_presets.java:2225 build/trans_presets.java:2226
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2375 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -21265,5 +21302,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:169
 msgid "permissive"
@@ -21310,5 +21347,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:174
 msgid "private"
@@ -21495,55 +21532,55 @@
 #: build/trans_presets.java:581 build/trans_presets.java:582
 #: build/trans_presets.java:583 build/trans_presets.java:584
-#: build/trans_presets.java:628 build/trans_presets.java:765
-#: build/trans_presets.java:787 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1412 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:1602 build/trans_presets.java:1693
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1707 build/trans_presets.java:1708
-#: build/trans_presets.java:1709 build/trans_presets.java:1820
-#: build/trans_presets.java:1821 build/trans_presets.java:1822
-#: build/trans_presets.java:1940 build/trans_presets.java:1941
-#: build/trans_presets.java:1942 build/trans_presets.java:1943
-#: build/trans_presets.java:1958 build/trans_presets.java:1959
-#: build/trans_presets.java:1960 build/trans_presets.java:1961
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:1994
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2026 build/trans_presets.java:2027
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2043 build/trans_presets.java:2044
-#: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2049 build/trans_presets.java:2065
-#: build/trans_presets.java:2066 build/trans_presets.java:2067
-#: build/trans_presets.java:2068 build/trans_presets.java:2088
-#: build/trans_presets.java:2089 build/trans_presets.java:2090
-#: build/trans_presets.java:2091 build/trans_presets.java:2107
-#: build/trans_presets.java:2108 build/trans_presets.java:2109
-#: build/trans_presets.java:2110 build/trans_presets.java:2124
-#: build/trans_presets.java:2125 build/trans_presets.java:2126
-#: build/trans_presets.java:2127 build/trans_presets.java:2143
-#: build/trans_presets.java:2144 build/trans_presets.java:2145
-#: build/trans_presets.java:2146 build/trans_presets.java:2162
-#: build/trans_presets.java:2163 build/trans_presets.java:2164
-#: build/trans_presets.java:2165 build/trans_presets.java:2178
-#: build/trans_presets.java:2179 build/trans_presets.java:2180
-#: build/trans_presets.java:2181 build/trans_presets.java:2195
-#: build/trans_presets.java:2196 build/trans_presets.java:2197
-#: build/trans_presets.java:2198 build/trans_presets.java:2212
-#: build/trans_presets.java:2213 build/trans_presets.java:2291
-#: build/trans_presets.java:2301 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:640 build/trans_presets.java:777
+#: build/trans_presets.java:799 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1424 build/trans_presets.java:1593
+#: build/trans_presets.java:1594 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:1614 build/trans_presets.java:1706
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1722 build/trans_presets.java:1833
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#: build/trans_presets.java:1987 build/trans_presets.java:1988
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2022 build/trans_presets.java:2023
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2039 build/trans_presets.java:2040
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2056 build/trans_presets.java:2057
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2062 build/trans_presets.java:2078
+#: build/trans_presets.java:2079 build/trans_presets.java:2080
+#: build/trans_presets.java:2081 build/trans_presets.java:2101
+#: build/trans_presets.java:2102 build/trans_presets.java:2103
+#: build/trans_presets.java:2104 build/trans_presets.java:2120
+#: build/trans_presets.java:2121 build/trans_presets.java:2122
+#: build/trans_presets.java:2123 build/trans_presets.java:2137
+#: build/trans_presets.java:2138 build/trans_presets.java:2139
+#: build/trans_presets.java:2140 build/trans_presets.java:2156
+#: build/trans_presets.java:2157 build/trans_presets.java:2158
+#: build/trans_presets.java:2159 build/trans_presets.java:2175
+#: build/trans_presets.java:2176 build/trans_presets.java:2177
+#: build/trans_presets.java:2178 build/trans_presets.java:2191
+#: build/trans_presets.java:2192 build/trans_presets.java:2193
+#: build/trans_presets.java:2194 build/trans_presets.java:2208
+#: build/trans_presets.java:2209 build/trans_presets.java:2210
+#: build/trans_presets.java:2211 build/trans_presets.java:2225
+#: build/trans_presets.java:2226 build/trans_presets.java:2304
+#: build/trans_presets.java:2314 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3238
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -21635,10 +21672,10 @@
 #. item "Barriers/Sally Port" check "Horse"
 #: build/trans_presets.java:449 build/trans_presets.java:580
-#: build/trans_presets.java:859 build/trans_presets.java:869
-#: build/trans_presets.java:878 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:969
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1006 build/trans_presets.java:1018
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:871 build/trans_presets.java:881
+#: build/trans_presets.java:890 build/trans_presets.java:916
+#: build/trans_presets.java:938 build/trans_presets.java:981
+#: build/trans_presets.java:994 build/trans_presets.java:1006
+#: build/trans_presets.java:1018 build/trans_presets.java:1030
+#: build/trans_presets.java:1070
 msgid "Horse"
 msgstr "马"
@@ -21676,11 +21713,11 @@
 #. group "Motorcycle"
 #: build/trans_presets.java:454 build/trans_presets.java:548
-#: build/trans_presets.java:860 build/trans_presets.java:870
-#: build/trans_presets.java:879 build/trans_presets.java:890
-#: build/trans_presets.java:905 build/trans_presets.java:927
-#: build/trans_presets.java:970 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1019 build/trans_presets.java:1059
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:872 build/trans_presets.java:882
+#: build/trans_presets.java:891 build/trans_presets.java:902
+#: build/trans_presets.java:917 build/trans_presets.java:939
+#: build/trans_presets.java:982 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1031 build/trans_presets.java:1071
+#: build/trans_presets.java:1699
 msgid "Motorcycle"
 msgstr "摩托车"
@@ -21699,9 +21736,9 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #: build/trans_presets.java:455 build/trans_presets.java:549
-#: build/trans_presets.java:584 build/trans_presets.java:891
-#: build/trans_presets.java:906 build/trans_presets.java:928
-#: build/trans_presets.java:971 build/trans_presets.java:984
-#: build/trans_presets.java:996 build/trans_presets.java:1008
-#: build/trans_presets.java:1020 build/trans_presets.java:1060
+#: build/trans_presets.java:584 build/trans_presets.java:903
+#: build/trans_presets.java:918 build/trans_presets.java:940
+#: build/trans_presets.java:983 build/trans_presets.java:996
+#: build/trans_presets.java:1008 build/trans_presets.java:1020
+#: build/trans_presets.java:1032 build/trans_presets.java:1072
 msgid "Motorcar"
 msgstr "汽车"
@@ -21789,4 +21826,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. </rule>
 #.
@@ -21800,15 +21838,17 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:480 build/trans_style.java:417
-#: build/trans_style.java:423
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:417 build/trans_style.java:423
 msgid "motorway"
 msgstr "高速公路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "motorway_link"
 msgstr "高速公路连络线"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21823,15 +21863,17 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:480 build/trans_style.java:429
-#: build/trans_style.java:435
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:429 build/trans_style.java:435
 msgid "trunk"
 msgstr "快速道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "trunk_link"
 msgstr "快速道路连络线"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21846,15 +21888,17 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:480 build/trans_style.java:441
-#: build/trans_style.java:447
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:441 build/trans_style.java:447
 msgid "primary"
 msgstr "一级道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "primary_link"
 msgstr "一级道路连络线"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21869,10 +21913,11 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:480 build/trans_style.java:453
-#: build/trans_style.java:459
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:453 build/trans_style.java:459
 msgid "secondary"
 msgstr "二级道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21887,15 +21932,17 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:480 build/trans_style.java:465
-#: build/trans_style.java:471
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:465 build/trans_style.java:471
 msgid "tertiary"
 msgstr "三级道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "unclassified"
 msgstr "未分类道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon src="misc/landmark/plant.png"/>
 #. </rule>
@@ -21904,14 +21951,17 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:480 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:2748
 msgid "residential"
 msgstr "居住区道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "living_street"
 msgstr "生活街道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21947,15 +21997,17 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:480 build/trans_style.java:513
-#: build/trans_style.java:3662
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:513 build/trans_style.java:3662
 msgid "service"
 msgstr "服务道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "bus_guideway"
 msgstr "有轨电车专用道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. </rule>
@@ -21975,6 +22027,7 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:480 build/trans_style.java:698
-#: build/trans_style.java:2803 build/trans_style.java:2804
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:698 build/trans_style.java:2803
+#: build/trans_style.java:2804
 msgid "construction"
 msgstr "施工"
@@ -22176,5 +22229,5 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:571 build/trans_presets.java:2881
+#: build/trans_presets.java:571 build/trans_presets.java:2894
 msgid "intermediate"
 msgstr "中等"
@@ -22207,13 +22260,13 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1943
-#: build/trans_presets.java:1961 build/trans_presets.java:1977
-#: build/trans_presets.java:1994 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2046
-#: build/trans_presets.java:2068 build/trans_presets.java:2091
-#: build/trans_presets.java:2110 build/trans_presets.java:2127
-#: build/trans_presets.java:2146 build/trans_presets.java:2165
-#: build/trans_presets.java:2181 build/trans_presets.java:2198
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:581 build/trans_presets.java:1956
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007 build/trans_presets.java:2025
+#: build/trans_presets.java:2042 build/trans_presets.java:2059
+#: build/trans_presets.java:2081 build/trans_presets.java:2104
+#: build/trans_presets.java:2123 build/trans_presets.java:2140
+#: build/trans_presets.java:2159 build/trans_presets.java:2178
+#: build/trans_presets.java:2194 build/trans_presets.java:2211
+#: build/trans_presets.java:2226
 msgid "Wheelchairs"
 msgstr "轮椅"
@@ -22243,6 +22296,167 @@
 
 #. </optional>
+#. item "Ways/Cycle Lane"
+#: build/trans_presets.java:612
+msgid "Cycle Lane"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Bicycle" />
+#. item "Ways/Cycle Lane" label "Edit Cycle Lane"
+#: build/trans_presets.java:614
+msgid "Edit Cycle Lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway"
+#: build/trans_presets.java:615
+msgid "Cycleway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2895
+#: build/trans_presets.java:2902 build/trans_presets.java:2910
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2928 build/trans_presets.java:2934
+#: build/trans_presets.java:2940 build/trans_presets.java:2946
+#: build/trans_presets.java:2952 build/trans_presets.java:2958
+#: build/trans_presets.java:2982 build/trans_presets.java:2988
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3012
+#: build/trans_presets.java:3018 build/trans_presets.java:3024
+#: build/trans_presets.java:3030 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081
+msgid "track"
+msgstr "轨迹"
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_track"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "share_busway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "shared_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway left"
+#: build/trans_presets.java:616
+msgid "Cycleway left"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway right"
+#: build/trans_presets.java:617
+msgid "Cycleway right"
+msgstr ""
+
+#. item "Ways/Cycle Lane" check "Oneway (bicycle)"
+#: build/trans_presets.java:618
+msgid "Oneway (bicycle)"
+msgstr ""
+
+#. <space />
+#. item "Ways/Cycle Lane" label "Edit Highway"
+#: build/trans_presets.java:620
+msgid "Edit Highway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Highway"
+#: build/trans_presets.java:621
+msgid "Highway"
+msgstr ""
+
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:624
 msgid "Dedicated Cycleway"
 msgstr "专用自行车道"
@@ -22260,11 +22474,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:616 build/trans_presets.java:638
-#: build/trans_presets.java:662
+#: build/trans_presets.java:628 build/trans_presets.java:650
+#: build/trans_presets.java:674
 msgid "Edit Cycleway"
 msgstr "编辑自行车道"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:628
+#: build/trans_presets.java:640
 msgid "Pedestrians"
 msgstr "行人"
@@ -22272,5 +22486,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:634
+#: build/trans_presets.java:646
 msgid "Segregated Foot- and Cycleway"
 msgstr "分离的步行与自行车道"
@@ -22278,5 +22492,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:670
 msgid "Combined Foot- and Cycleway"
 msgstr "合并的步行与自行车道"
@@ -22284,5 +22498,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:683
+#: build/trans_presets.java:695
 msgid "Dedicated Footway"
 msgstr "专用人行步道"
@@ -22291,5 +22505,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:698
 msgid "Edit Footway"
 msgstr "编辑人行步道"
@@ -22297,5 +22511,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:703
+#: build/trans_presets.java:715
 msgid "Steps"
 msgstr "楼梯"
@@ -22305,10 +22519,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:719
 msgid "Edit Flight of Steps"
 msgstr "编辑楼梯"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:733
 msgid "Amount of Steps"
 msgstr "阶梯数"
@@ -22316,5 +22530,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:737
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -22322,5 +22536,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:726
+#: build/trans_presets.java:738
 msgid "Motorway Junction"
 msgstr "高速公路出口"
@@ -22328,10 +22542,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:728
+#: build/trans_presets.java:740
 msgid "Edit Motorway Junction"
 msgstr "编辑高速公路出口"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:744
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22340,10 +22554,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:745
 msgid "Exit to"
 msgstr "至"
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:747
 msgid "Services"
 msgstr "服务站"
@@ -22351,5 +22565,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:749
 msgid "Edit Service Station"
 msgstr "编辑服务站"
@@ -22365,4 +22579,5 @@
 #. item "Car/Tyres" text "Operator"
 #. item "Car/Rental" text "Operator"
+#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Operator"
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
@@ -22442,42 +22657,42 @@
 #. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:742 build/trans_presets.java:915
-#: build/trans_presets.java:1600 build/trans_presets.java:1624
-#: build/trans_presets.java:1633 build/trans_presets.java:1642
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1673 build/trans_presets.java:1682
-#: build/trans_presets.java:1701 build/trans_presets.java:1840
-#: build/trans_presets.java:1937 build/trans_presets.java:1955
-#: build/trans_presets.java:2006 build/trans_presets.java:2023
-#: build/trans_presets.java:2082 build/trans_presets.java:2103
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2289 build/trans_presets.java:2299
-#: build/trans_presets.java:2360 build/trans_presets.java:2446
-#: build/trans_presets.java:2471 build/trans_presets.java:2514
-#: build/trans_presets.java:2547 build/trans_presets.java:2575
-#: build/trans_presets.java:2592 build/trans_presets.java:2600
-#: build/trans_presets.java:2612 build/trans_presets.java:2632
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2731 build/trans_presets.java:2953
-#: build/trans_presets.java:2962 build/trans_presets.java:3084
-#: build/trans_presets.java:3103 build/trans_presets.java:3122
-#: build/trans_presets.java:3140 build/trans_presets.java:3151
-#: build/trans_presets.java:3167 build/trans_presets.java:3223
-#: build/trans_presets.java:3270 build/trans_presets.java:3278
-#: build/trans_presets.java:3286 build/trans_presets.java:3311
-#: build/trans_presets.java:3426 build/trans_presets.java:3435
-#: build/trans_presets.java:3452 build/trans_presets.java:3461
-#: build/trans_presets.java:3498 build/trans_presets.java:3547
-#: build/trans_presets.java:3570 build/trans_presets.java:3579
-#: build/trans_presets.java:3601 build/trans_presets.java:3616
-#: build/trans_presets.java:3626 build/trans_presets.java:3635
-#: build/trans_presets.java:3663 build/trans_presets.java:3672
-#: build/trans_presets.java:3711 build/trans_presets.java:3727
-#: build/trans_presets.java:3736 build/trans_presets.java:3745
-#: build/trans_presets.java:3761 build/trans_presets.java:3783
-#: build/trans_presets.java:3798 build/trans_presets.java:3807
-#: build/trans_presets.java:4082 build/trans_presets.java:4175
-#: build/trans_presets.java:4324 build/trans_presets.java:4354
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:754 build/trans_presets.java:927
+#: build/trans_presets.java:1612 build/trans_presets.java:1636
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1714 build/trans_presets.java:1853
+#: build/trans_presets.java:1950 build/trans_presets.java:1968
+#: build/trans_presets.java:2019 build/trans_presets.java:2036
+#: build/trans_presets.java:2095 build/trans_presets.java:2116
+#: build/trans_presets.java:2152 build/trans_presets.java:2171
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
+#: build/trans_presets.java:2373 build/trans_presets.java:2459
+#: build/trans_presets.java:2484 build/trans_presets.java:2527
+#: build/trans_presets.java:2560 build/trans_presets.java:2588
+#: build/trans_presets.java:2605 build/trans_presets.java:2613
+#: build/trans_presets.java:2625 build/trans_presets.java:2645
+#: build/trans_presets.java:2654 build/trans_presets.java:2661
+#: build/trans_presets.java:2744 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:3097
+#: build/trans_presets.java:3116 build/trans_presets.java:3135
+#: build/trans_presets.java:3153 build/trans_presets.java:3164
+#: build/trans_presets.java:3180 build/trans_presets.java:3236
+#: build/trans_presets.java:3283 build/trans_presets.java:3291
+#: build/trans_presets.java:3299 build/trans_presets.java:3324
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3465 build/trans_presets.java:3474
+#: build/trans_presets.java:3511 build/trans_presets.java:3560
+#: build/trans_presets.java:3583 build/trans_presets.java:3592
+#: build/trans_presets.java:3614 build/trans_presets.java:3629
+#: build/trans_presets.java:3639 build/trans_presets.java:3648
+#: build/trans_presets.java:3676 build/trans_presets.java:3685
+#: build/trans_presets.java:3724 build/trans_presets.java:3740
+#: build/trans_presets.java:3749 build/trans_presets.java:3758
+#: build/trans_presets.java:3774 build/trans_presets.java:3796
+#: build/trans_presets.java:3811 build/trans_presets.java:3820
+#: build/trans_presets.java:4095 build/trans_presets.java:4188
+#: build/trans_presets.java:4337 build/trans_presets.java:4367
+#: build/trans_presets.java:4389
 msgid "Operator"
 msgstr "经营者"
@@ -22486,6 +22701,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:743 build/trans_presets.java:753
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:755 build/trans_presets.java:765
+#: build/trans_presets.java:2641
 msgid "Toilets"
 msgstr "厕所"
@@ -22493,5 +22708,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:746
+#: build/trans_presets.java:758
 msgid "Rest Area"
 msgstr "休息区"
@@ -22499,5 +22714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:760
 msgid "Edit Rest Area"
 msgstr "编辑休息区"
@@ -22505,5 +22720,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:768
 msgid "Emergency Phone"
 msgstr "紧急电话"
@@ -22513,5 +22728,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:773
 msgid "Traffic Signal"
 msgstr "信号灯"
@@ -22521,5 +22736,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:765
+#: build/trans_presets.java:777
 msgid "Pedestrian crossing type"
 msgstr "人行横道类型"
@@ -22528,6 +22743,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "uncontrolled"
 msgstr "没有信号灯"
@@ -22536,6 +22751,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "traffic_signals"
 msgstr "信号灯"
@@ -22544,6 +22759,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "island"
 msgstr "安全岛"
@@ -22552,6 +22767,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "unmarked"
 msgstr "未画标记"
@@ -22560,6 +22775,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:766 build/trans_presets.java:789
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:778 build/trans_presets.java:801
+#: build/trans_presets.java:1425
 msgid "Cross on horseback"
 msgstr "骑马穿越"
@@ -22568,6 +22783,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:788
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:779 build/trans_presets.java:800
+#: build/trans_presets.java:1426
 msgid "Cross by bicycle"
 msgstr "以自行车穿越"
@@ -22576,11 +22791,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:768 build/trans_presets.java:790
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:1427
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:769
+#: build/trans_presets.java:781
 msgid "Crossing type name (UK)"
 msgstr "人行横道类型名称 (英国)"
@@ -22588,5 +22803,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "zebra"
 msgstr "斑马线"
@@ -22594,5 +22809,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pelican"
 msgstr ""
@@ -22600,5 +22815,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "toucan"
 msgstr ""
@@ -22606,5 +22821,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "puffin"
 msgstr ""
@@ -22612,5 +22827,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pegasus"
 msgstr ""
@@ -22618,5 +22833,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "tiger"
 msgstr ""
@@ -22624,5 +22839,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:784
 msgid "Stop"
 msgstr "禁止通行"
@@ -22630,5 +22845,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:787
 msgid "Mini-roundabout"
 msgstr "小型环岛"
@@ -22639,15 +22854,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "clockwise"
 msgstr "顺时针"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:794
 msgid "Pedestrian Crossing"
 msgstr "人行横道"
@@ -22656,15 +22871,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:797
 msgid "Edit Crossing"
 msgstr "编辑人行横道"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:791
+#: build/trans_presets.java:803
 msgid "Type name (UK)"
 msgstr "类型名称(英国)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:805
 msgid "Traffic Calming"
 msgstr "道路减速设施"
@@ -22672,40 +22887,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:807
 msgid "Edit Traffic Calming"
 msgstr "编辑道路减速设施"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:798
+#: build/trans_presets.java:810
 msgid "Passing Place"
 msgstr "让车处"
@@ -22713,5 +22928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:812
 msgid "Edit Passing Place"
 msgstr "编辑让车处"
@@ -22719,5 +22934,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:815
 msgid "Turning Circle"
 msgstr "回旋圈"
@@ -22727,5 +22942,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:808
+#: build/trans_presets.java:820
 msgid "City Limit"
 msgstr "城市边界"
@@ -22733,15 +22948,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:822
 msgid "Edit City Limit Sign"
 msgstr "编辑城市边界标志"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:827
 msgid "Second Name"
 msgstr "第二名称"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:817
+#: build/trans_presets.java:829
 msgid "Speed Camera"
 msgstr "测速照相"
@@ -22751,5 +22966,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:834
 msgid "Grit Bin"
 msgstr "除雪沙/盐箱"
@@ -22759,10 +22974,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr "浅滩"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:828
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr "编辑浅滩"
@@ -22770,5 +22985,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr "隘口"
@@ -22776,5 +22991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr "编辑隘口"
@@ -22786,7 +23001,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:842 build/trans_presets.java:2024
-#: build/trans_presets.java:2273 build/trans_presets.java:3948
-#: build/trans_presets.java:3956 build/trans_presets.java:3964
+#: build/trans_presets.java:854 build/trans_presets.java:2037
+#: build/trans_presets.java:2286 build/trans_presets.java:3961
+#: build/trans_presets.java:3969 build/trans_presets.java:3977
 msgid "Elevation"
 msgstr "海拔"
@@ -22821,18 +23036,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:843 build/trans_presets.java:1099
-#: build/trans_presets.java:1110 build/trans_presets.java:1124
-#: build/trans_presets.java:1139 build/trans_presets.java:1866
-#: build/trans_presets.java:2328 build/trans_presets.java:2399
-#: build/trans_presets.java:3326 build/trans_presets.java:3857
-#: build/trans_presets.java:3864 build/trans_presets.java:3871
-#: build/trans_presets.java:3878 build/trans_presets.java:3885
-#: build/trans_presets.java:3893 build/trans_presets.java:3901
-#: build/trans_presets.java:3909 build/trans_presets.java:3916
-#: build/trans_presets.java:3923 build/trans_presets.java:3930
-#: build/trans_presets.java:3939 build/trans_presets.java:3949
-#: build/trans_presets.java:3957 build/trans_presets.java:3965
-#: build/trans_presets.java:3972 build/trans_presets.java:3981
-#: build/trans_presets.java:3989 build/trans_presets.java:4254
+#: build/trans_presets.java:855 build/trans_presets.java:1111
+#: build/trans_presets.java:1122 build/trans_presets.java:1136
+#: build/trans_presets.java:1151 build/trans_presets.java:1879
+#: build/trans_presets.java:2341 build/trans_presets.java:2412
+#: build/trans_presets.java:3339 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3891 build/trans_presets.java:3898
+#: build/trans_presets.java:3906 build/trans_presets.java:3914
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3936 build/trans_presets.java:3943
+#: build/trans_presets.java:3952 build/trans_presets.java:3962
+#: build/trans_presets.java:3970 build/trans_presets.java:3978
+#: build/trans_presets.java:3985 build/trans_presets.java:3994
+#: build/trans_presets.java:4002 build/trans_presets.java:4267
 msgid "Wikipedia"
 msgstr "维基百科"
@@ -22840,5 +23055,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:859
 msgid "Barriers"
 msgstr "障碍物"
@@ -22846,5 +23061,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:850
+#: build/trans_presets.java:862
 msgid "Bollard"
 msgstr "车阻柱"
@@ -22852,5 +23067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:864
 msgid "Edit Bollard"
 msgstr "编辑车阻柱"
@@ -22900,27 +23115,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:855 build/trans_presets.java:865
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:900 build/trans_presets.java:922
-#: build/trans_presets.java:965 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1014 build/trans_presets.java:1026
-#: build/trans_presets.java:1036 build/trans_presets.java:1045
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:867 build/trans_presets.java:877
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:912 build/trans_presets.java:934
+#: build/trans_presets.java:977 build/trans_presets.java:990
+#: build/trans_presets.java:1002 build/trans_presets.java:1014
+#: build/trans_presets.java:1026 build/trans_presets.java:1038
+#: build/trans_presets.java:1048 build/trans_presets.java:1057
+#: build/trans_presets.java:1066
 msgid "Allowed traffic:"
 msgstr "允许通行方向："
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:874
 msgid "Cycle Barrier"
 msgstr "自行车护栏"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:872
+#: build/trans_presets.java:884
 msgid "Block"
 msgstr "水泥护栏"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:893
 msgid "Cattle Grid"
 msgstr "家畜栅栏"
@@ -22928,10 +23143,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:895
 msgid "Edit Cattle Grid"
 msgstr "编辑家畜栅栏"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:905
 msgid "Bus Trap"
 msgstr "公交车专用道障碍"
@@ -22939,15 +23154,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:908
 msgid "Spikes"
 msgstr "长钉"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:897
+#: build/trans_presets.java:909
 msgid "Edit Spikes"
 msgstr "编辑长钉"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:920
 msgid "Toll Booth"
 msgstr "收费站"
@@ -22955,5 +23170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:910
+#: build/trans_presets.java:922
 msgid "Edit Toll Booth"
 msgstr "编辑收费站"
@@ -22961,10 +23176,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:930
 msgid "Border Control"
 msgstr "国境管控站"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:931
 msgid "Edit Border Control"
 msgstr "编辑国境管控站"
@@ -22973,20 +23188,19 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:945
 msgid "Hedge"
-msgstr "篱笆"
+msgstr "树篱"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:937
+#: build/trans_presets.java:949
 msgid "Fence"
-msgstr "栅栏"
+msgstr "围栏"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
 #. item "Barriers/Wire Fence"
-#: build/trans_presets.java:941
-#, fuzzy
+#: build/trans_presets.java:953
 msgid "Wire Fence"
 msgstr "铁丝网"
@@ -22994,12 +23208,11 @@
 #. <key key="barrier" value="wire_fence" />
 #. item "Barriers/Wood Fence"
-#: build/trans_presets.java:944
-#, fuzzy
+#: build/trans_presets.java:956
 msgid "Wood Fence"
-msgstr "木栅栏"
+msgstr "木围栏"
 
 #. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:959
 msgid "Wall"
 msgstr "墙"
@@ -23007,5 +23220,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:950
+#: build/trans_presets.java:962
 msgid "City Wall"
 msgstr "城墙"
@@ -23014,5 +23227,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:966
 msgid "Retaining Wall"
 msgstr "挡土墙"
@@ -23023,15 +23236,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:961
+#: build/trans_presets.java:973
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:974
 msgid "Edit Entrance"
 msgstr "编辑入口"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:985
 msgid "Gate"
 msgstr "门"
@@ -23039,50 +23252,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:987
 msgid "Edit Gate"
 msgstr "编辑门"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:986
+#: build/trans_presets.java:998
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:987
+#: build/trans_presets.java:999
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1010
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1011
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1022
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1034
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1043
 msgid "Stile"
 msgstr "栅栏台阶"
@@ -23090,25 +23303,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1045
 msgid "Edit Stile"
 msgstr "编辑栅栏台阶"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1053
 msgid "Turnstile"
 msgstr "旋转栅门"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr "编辑旋转栅门"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1062
 msgid "Sally Port"
 msgstr "城门"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr "编辑城门"
@@ -23118,6 +23331,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1065 build/trans_presets.java:1066
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1077 build/trans_presets.java:1078
+#: build/trans_presets.java:1179
 msgid "Water"
 msgstr "水域"
@@ -23125,5 +23338,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1080
 msgid "Drain"
 msgstr "渠"
@@ -23131,10 +23344,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1082
 msgid "Edit Drain"
 msgstr "编辑渠"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1088
 msgid "Ditch"
 msgstr "沟"
@@ -23142,10 +23355,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1090
 msgid "Edit Ditch"
 msgstr "编辑沟"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1084
+#: build/trans_presets.java:1096
 msgid "Stream"
 msgstr "溪流"
@@ -23153,10 +23366,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1098
 msgid "Edit Stream"
 msgstr "编辑溪流"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1104
 msgid "Canal"
 msgstr "运河"
@@ -23164,10 +23377,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1106
 msgid "Edit Canal"
 msgstr "编辑运河"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1113
 msgid "River"
 msgstr "河流"
@@ -23177,5 +23390,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1105
+#: build/trans_presets.java:1117
 msgid "Edit River"
 msgstr "编辑河流"
@@ -23183,5 +23396,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1125
 msgid "Spring"
 msgstr "泉"
@@ -23189,20 +23402,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1127
 msgid "Edit Spring"
 msgstr "编辑泉"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1131
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1132
 msgid "Edit Waterfall"
 msgstr "编辑瀑布"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1138
 msgid "Weir"
 msgstr "堰"
@@ -23210,10 +23423,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1140
 msgid "Edit Weir"
 msgstr "编辑堰"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1145
 msgid "Dam"
 msgstr "水坝"
@@ -23221,10 +23434,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1147
 msgid "Edit Dam"
 msgstr "编辑水坝"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1153
 msgid "Groyne"
 msgstr "防波堤"
@@ -23232,5 +23445,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1155
 msgid "Edit Groyne"
 msgstr "编辑防波堤"
@@ -23240,15 +23453,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1160
 msgid "Basin"
 msgstr "水池"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr "编辑水池"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
 msgid "Reservoir"
 msgstr "贮水处"
@@ -23256,15 +23469,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1168
 msgid "Edit Reservoir Landuse"
 msgstr "编辑贮水处"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1173
 msgid "Covered Reservoir"
 msgstr "有覆盖的贮水处"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr "编辑有覆盖的贮水处"
@@ -23272,20 +23485,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
 msgid "Edit Water"
 msgstr "编辑水域"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1185
 msgid "Land"
 msgstr "陆地"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1186
 msgid "Edit Land"
 msgstr "编辑陆地"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
 msgid "Coastline"
 msgstr "海岸线"
@@ -23293,10 +23506,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1192
 msgid "Edit Coastline"
 msgstr "编辑海岸线"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1196
 msgid "Riverbank"
 msgstr "河岸"
@@ -23305,5 +23518,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1199
 msgid "Edit Riverbank"
 msgstr "编辑河岸"
@@ -23311,5 +23524,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1204
 msgid "Wetland"
 msgstr "湿地"
@@ -23320,15 +23533,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1209
 msgid "Edit Wetland"
 msgstr "编辑湿地"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "swamp"
 msgstr "沼泽(swamp)"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "bog"
 msgstr "沼泽(bog)"
@@ -23341,40 +23554,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1200 build/trans_style.java:2930
+#: build/trans_presets.java:1212 build/trans_style.java:2930
 msgid "marsh"
 msgstr "沼泽(marsh)"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "reedbed"
 msgstr "芦苇荡"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "saltmarsh"
 msgstr "盐碱滩"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "tidalflat"
 msgstr "滩涂"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "mangrove"
 msgstr "红树林"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
 msgid "Mud"
 msgstr "泥浆地"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
 msgid "Edit Mud"
 msgstr "编辑泥浆地"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1219
 msgid "Beach"
 msgstr "海滩"
@@ -23382,20 +23595,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1221
 msgid "Edit Beach"
 msgstr "编辑海滩"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1225
 msgid "Bay"
 msgstr "海湾"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Edit Bay"
 msgstr "编辑海湾"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1230
 msgid "Cliff"
 msgstr "断崖"
@@ -23403,15 +23616,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1232
 msgid "Edit Cliff"
 msgstr "编辑断崖"
 
 #. group "Shipping"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1237
 msgid "Shipping"
 msgstr "船运"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "Ferry Terminal"
 msgstr "渡轮端点"
@@ -23419,20 +23632,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1240
 msgid "Edit Ferry Terminal"
 msgstr "编辑渡轮端点"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "Cargo"
 msgstr "装载物"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers"
 msgstr "乘客"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "vehicle"
 msgstr "车辆"
@@ -23518,6 +23731,6 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1231 build/trans_presets.java:4317
-#: build/trans_presets.java:4347 build/trans_style.java:189
+#: build/trans_presets.java:1243 build/trans_presets.java:4330
+#: build/trans_presets.java:4360 build/trans_style.java:189
 #: build/trans_style.java:525 build/trans_style.java:545
 #: build/trans_style.java:551 build/trans_style.java:570
@@ -23529,15 +23742,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "hgv"
 msgstr "大型货车"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers;vehicle"
 msgstr "旅客和车辆"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1245
 msgid "Ferry Route"
 msgstr "渡轮路线"
@@ -23545,5 +23758,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1247
 msgid "Edit Ferry"
 msgstr "编辑渡轮"
@@ -23552,15 +23765,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "Marina"
 msgstr "码头"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1244
+#: build/trans_presets.java:1256
 msgid "Edit Marina"
 msgstr "编辑码头"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1260
 msgid "Pier"
 msgstr "渡头"
@@ -23568,10 +23781,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1262
 msgid "Edit Pier"
 msgstr "编辑渡头"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1266
 msgid "Lock Gate"
 msgstr "水闸"
@@ -23580,5 +23793,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1270
 msgid "Turning Point"
 msgstr "回旋点"
@@ -23588,5 +23801,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1275
 msgid "Slipway"
 msgstr "船台"
@@ -23596,10 +23809,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1279
 msgid "Edit Slipway"
 msgstr "编辑造船台"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1283
 msgid "Boatyard"
 msgstr "船厂"
@@ -23607,10 +23820,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1285
 msgid "Edit Boatyard"
 msgstr "编辑船厂"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1290
 msgid "Dock"
 msgstr "船坞"
@@ -23618,20 +23831,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:1292
 msgid "Edit Dock"
 msgstr "编辑船坞"
 
 #. group "Transport"
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1299
 msgid "Transport"
 msgstr "运输"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1300
 msgid "Railway"
 msgstr "铁路"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1301
 msgid "Rail"
 msgstr "轨道"
@@ -23639,5 +23852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "Edit Rail"
 msgstr "编辑轨道"
@@ -23667,7 +23880,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1295 build/trans_presets.java:1307
-#: build/trans_presets.java:1331 build/trans_presets.java:1343
-#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1343 build/trans_presets.java:1355
+#: build/trans_presets.java:1367 build/trans_presets.java:1379
 msgid "Gauge (mm)"
 msgstr "轨距(mm)"
@@ -23683,8 +23896,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "Types"
 msgstr "类型"
@@ -23698,8 +23911,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "yard"
 msgstr "干线"
@@ -23713,8 +23926,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "siding"
 msgstr "侧线"
@@ -23728,8 +23941,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "spur"
 msgstr "支线"
@@ -23742,8 +23955,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "Electrified"
 msgstr "电气化"
@@ -23756,8 +23969,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "contact_line"
 msgstr "接触网"
@@ -23818,8 +24031,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_style.java:595
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -23841,9 +24054,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
-#: build/trans_presets.java:1346 build/trans_presets.java:1358
-#: build/trans_presets.java:1370 build/trans_presets.java:1625
-#: build/trans_presets.java:3314
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382 build/trans_presets.java:1637
+#: build/trans_presets.java:3327
 msgid "Voltage"
 msgstr "电压"
@@ -23856,8 +24069,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "Frequency (Hz)"
 msgstr "频率(Hz)"
@@ -23870,8 +24083,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "16.7"
 msgstr "16.7"
@@ -23879,10 +24092,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1314
 msgid "Narrow Gauge Rail"
 msgstr "窄轨"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1315
 msgid "Edit Narrow Gauge Rail"
 msgstr "编辑窄轨"
@@ -23890,5 +24103,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1326
 msgid "Monorail"
 msgstr "单轨"
@@ -23896,5 +24109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1328
 msgid "Edit Monorail"
 msgstr "编辑单轨"
@@ -23902,10 +24115,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1338
 msgid "Preserved"
 msgstr "保留铁路"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr "编辑保留的铁路"
@@ -23913,10 +24126,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1350
 msgid "Light Rail"
 msgstr "轻轨"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1351
 msgid "Edit Light Rail"
 msgstr "编辑轻轨"
@@ -23924,10 +24137,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1362
 msgid "Subway"
 msgstr "地铁"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1363
 msgid "Edit Subway"
 msgstr "编辑地铁"
@@ -23935,10 +24148,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1374
 msgid "Tram"
 msgstr "有轨电车"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1375
 msgid "Edit Tram"
 msgstr "编辑有轨电车"
@@ -23946,5 +24159,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1386
 msgid "Bus Guideway"
 msgstr "导轨巴士"
@@ -23952,5 +24165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1388
 msgid "Edit Bus Guideway"
 msgstr "编辑导轨巴士"
@@ -23959,10 +24172,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1406
 msgid "Disused Rail"
 msgstr "不使用的轨道"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1407
 msgid "Edit Disused Railway"
 msgstr "编辑不使用的铁路"
@@ -23971,10 +24184,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1410
 msgid "Optional Types"
 msgstr "选择性的类型"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1412
 msgid "Abandoned Rail"
 msgstr "废弃的轨道"
@@ -23983,5 +24196,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1416
 msgid "Level Crossing"
 msgstr "铁路平交道"
@@ -23990,5 +24203,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1420
 msgid "Crossing"
 msgstr "平交道"
@@ -23998,5 +24211,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1424
 msgid "Crossing type"
 msgstr "平交道类型"
@@ -24004,5 +24217,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1430
 msgid "Turntable"
 msgstr "调车转盘"
@@ -24011,5 +24224,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1434
 msgid "Buffer Stop"
 msgstr "止冲器"
@@ -24018,10 +24231,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1439
 msgid "Aerialway"
 msgstr "空中线路"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1440
 msgid "Chair Lift"
 msgstr "椅式升降机"
@@ -24029,5 +24242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1442
 msgid "Edit Chair Lift"
 msgstr "编辑椅式升降机"
@@ -24049,12 +24262,12 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1433 build/trans_presets.java:1447
-#: build/trans_presets.java:1458 build/trans_presets.java:1471
-#: build/trans_presets.java:1484 build/trans_presets.java:1498
-#: build/trans_presets.java:1509 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1542
-#: build/trans_presets.java:1552 build/trans_presets.java:1579
-#: build/trans_presets.java:2290 build/trans_presets.java:2300
-#: build/trans_presets.java:2633 build/trans_presets.java:3808
+#: build/trans_presets.java:1445 build/trans_presets.java:1459
+#: build/trans_presets.java:1470 build/trans_presets.java:1483
+#: build/trans_presets.java:1496 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1532
+#: build/trans_presets.java:1543 build/trans_presets.java:1554
+#: build/trans_presets.java:1564 build/trans_presets.java:1591
+#: build/trans_presets.java:2303 build/trans_presets.java:2313
+#: build/trans_presets.java:2646 build/trans_presets.java:3821
 msgid "Reference number"
 msgstr "编号"
@@ -24080,18 +24293,16 @@
 #. <optional>
 #. item "Aerialway/Magic Carpet" text "Number of people per hour"
-#: build/trans_presets.java:1435 build/trans_presets.java:1449
-#: build/trans_presets.java:1460 build/trans_presets.java:1473
-#: build/trans_presets.java:1486 build/trans_presets.java:1500
-#: build/trans_presets.java:1511 build/trans_presets.java:1522
-#: build/trans_presets.java:1533 build/trans_presets.java:1544
-#, fuzzy
+#: build/trans_presets.java:1447 build/trans_presets.java:1461
+#: build/trans_presets.java:1472 build/trans_presets.java:1485
+#: build/trans_presets.java:1498 build/trans_presets.java:1512
+#: build/trans_presets.java:1523 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1556
 msgid "Number of people per hour"
-msgstr "营地编码"
+msgstr "每小时运量"
 
 #. item "Aerialway/Chair Lift" text "Number of people per chair"
-#: build/trans_presets.java:1436
-#, fuzzy
+#: build/trans_presets.java:1448
 msgid "Number of people per chair"
-msgstr "营地编码"
+msgstr "每椅子的人数"
 
 #. item "Aerialway/Chair Lift" text "Typical journey time in minutes"
@@ -24107,16 +24318,16 @@
 #. <optional>
 #. item "Aerialway/Goods" text "Typical journey time in minutes"
-#: build/trans_presets.java:1437 build/trans_presets.java:1450
-#: build/trans_presets.java:1462 build/trans_presets.java:1475
-#: build/trans_presets.java:1488 build/trans_presets.java:1501
-#: build/trans_presets.java:1512 build/trans_presets.java:1523
-#: build/trans_presets.java:1534 build/trans_presets.java:1545
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1449 build/trans_presets.java:1462
+#: build/trans_presets.java:1474 build/trans_presets.java:1487
+#: build/trans_presets.java:1500 build/trans_presets.java:1513
+#: build/trans_presets.java:1524 build/trans_presets.java:1535
+#: build/trans_presets.java:1546 build/trans_presets.java:1557
+#: build/trans_presets.java:1566
 msgid "Typical journey time in minutes"
-msgstr ""
+msgstr "典型行程用时(分钟)"
 
 #. item "Aerialway/Chair Lift" check "Has bubble?"
 #. item "Aerialway/Mixed Lift" check "Has bubble?"
-#: build/trans_presets.java:1438 build/trans_presets.java:1489
+#: build/trans_presets.java:1450 build/trans_presets.java:1501
 msgid "Has bubble?"
 msgstr ""
@@ -24126,13 +24337,12 @@
 #. item "Aerialway/Gondola" check "Has heating?"
 #. item "Aerialway/Mixed Lift" check "Has heating?"
-#: build/trans_presets.java:1439 build/trans_presets.java:1463
-#: build/trans_presets.java:1476 build/trans_presets.java:1490
-#, fuzzy
+#: build/trans_presets.java:1451 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1502
 msgid "Has heating?"
-msgstr "滑冰"
+msgstr "有加热吗？"
 
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1454
 msgid "Drag Lift"
 msgstr "拖曳升降机"
@@ -24140,5 +24350,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1456
 msgid "Edit Drag Lift"
 msgstr "编辑拖曳升降机"
@@ -24146,5 +24356,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1465
 msgid "Cable Car"
 msgstr "缆车"
@@ -24152,46 +24362,44 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1467
 msgid "Edit Cable Car"
 msgstr "编辑缆车"
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1461
-#, fuzzy
+#: build/trans_presets.java:1473
 msgid "Number of people per car"
-msgstr "营地编码"
+msgstr "每车的人数"
 
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1478
 msgid "Gondola"
-msgstr "吊舱"
+msgstr "索道"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1480
 msgid "Edit Gondola"
-msgstr "编辑吊舱"
+msgstr "编辑索道"
 
 #. item "Aerialway/Gondola" text "Number of people per gondola"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1486
 msgid "Number of people per gondola"
-msgstr ""
+msgstr "每厢的人数"
 
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1479
-#, fuzzy
+#: build/trans_presets.java:1491
 msgid "Mixed Lift"
-msgstr "椅式升降机"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1493
 msgid "Edit Mixed Lift (containing both gondolas and chairs)"
 msgstr ""
 
 #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
-#: build/trans_presets.java:1487
+#: build/trans_presets.java:1499
 msgid "Number of people per gondola/chair"
 msgstr ""
@@ -24199,61 +24407,53 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1493
-#, fuzzy
+#: build/trans_presets.java:1505
 msgid "T-bar Lift"
-msgstr "椅式升降机"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
-#: build/trans_presets.java:1495
-#, fuzzy
+#: build/trans_presets.java:1507
 msgid "Edit T-bar Lift"
-msgstr "编辑椅式升降机"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1504
-#, fuzzy
+#: build/trans_presets.java:1516
 msgid "J-bar Lift"
-msgstr "椅式升降机"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
-#: build/trans_presets.java:1506
-#, fuzzy
+#: build/trans_presets.java:1518
 msgid "Edit J-bar Lift"
-msgstr "编辑椅式升降机"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1515
-#, fuzzy
+#: build/trans_presets.java:1527
 msgid "Platter Lift"
-msgstr "椅式升降机"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Platter Lift" label "Edit Platter Lift"
-#: build/trans_presets.java:1517
-#, fuzzy
+#: build/trans_presets.java:1529
 msgid "Edit Platter Lift"
-msgstr "编辑椅式升降机"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1526
-#, fuzzy
+#: build/trans_presets.java:1538
 msgid "Rope Tow"
-msgstr "电塔"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Rope Tow" label "Edit Rope Tow"
-#: build/trans_presets.java:1528
-#, fuzzy
+#: build/trans_presets.java:1540
 msgid "Edit Rope Tow"
-msgstr "编辑电塔"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1549
 msgid "Magic Carpet"
 msgstr ""
@@ -24261,12 +24461,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
-#: build/trans_presets.java:1539
-#, fuzzy
+#: build/trans_presets.java:1551
 msgid "Edit Magic Carpet"
-msgstr "编辑缆车"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Goods"
@@ -24274,5 +24473,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1561
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24282,5 +24481,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1570
 msgctxt "aerialway"
 msgid "Station"
@@ -24289,5 +24488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1572
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24295,5 +24494,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1576
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24302,5 +24501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1578
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24318,6 +24517,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1573 build/trans_presets.java:1687
-#: build/trans_presets.java:1719 build/trans_surveyor.java:24
+#: build/trans_presets.java:1585 build/trans_presets.java:1700
+#: build/trans_presets.java:1732 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "停车场"
@@ -24326,5 +24525,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1588
 msgid "Edit Parking"
 msgstr "编辑停车场"
@@ -24332,5 +24531,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "multi-storey"
 msgstr "多层"
@@ -24338,5 +24537,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "surface"
 msgstr "平面"
@@ -24344,10 +24543,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "underground"
 msgstr "地下"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1593
 msgid "Park and Ride"
 msgstr "停车换乘"
@@ -24358,7 +24557,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1582 build/trans_presets.java:1693
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:1594 build/trans_presets.java:1706
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2647
 msgid "Fee"
 msgstr "费用"
@@ -24366,25 +24565,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1596
 msgid "Capacity (overall)"
 msgstr "容量 (整体)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1597
 msgid "Spaces for Disabled"
 msgstr "残障专用空间"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1598
 msgid "Spaces for Women"
 msgstr "女性专用空间"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1599
 msgid "Spaces for Parents"
 msgstr "父母专用空间"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1600
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "请参见维基页上的其他容量标签 capacity：[types]=*"
@@ -24392,5 +24591,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1603
 msgid "Fuel"
 msgstr "加油站"
@@ -24400,5 +24599,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1607
 msgid "Edit Fuel"
 msgstr "编辑加油站"
@@ -24410,120 +24609,118 @@
 #. item "Car/Tyres" text "Brand"
 #. item "Car/Rental" text "Brand"
-#. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1597 build/trans_presets.java:1632
-#: build/trans_presets.java:1648 build/trans_presets.java:1656
-#: build/trans_presets.java:1672 build/trans_presets.java:1681
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1609 build/trans_presets.java:1644
+#: build/trans_presets.java:1660 build/trans_presets.java:1668
+#: build/trans_presets.java:1684 build/trans_presets.java:1713
 msgid "Brand"
 msgstr "品牌"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Agip"
 msgstr "阿吉普(Agip)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Aral"
 msgstr "亚拉(Aral)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "BP"
 msgstr "英国石油(BP)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Esso"
 msgstr "埃索(Esso)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "OMV"
 msgstr "奥地利石油和天然气集团(OMV)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Q8"
 msgstr "科威特石油(Q8)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Repsol"
 msgstr "雷普索尔(Repsol)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Shell"
 msgstr "壳牌(Shell)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Total"
 msgstr "道达尔(Total)"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Independent"
 msgstr "个体"
@@ -24616,48 +24813,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2226
-#: build/trans_presets.java:2241 build/trans_presets.java:2327
-#: build/trans_presets.java:2338 build/trans_presets.java:2345
-#: build/trans_presets.java:2361 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2601 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2239
+#: build/trans_presets.java:2254 build/trans_presets.java:2340
+#: build/trans_presets.java:2351 build/trans_presets.java:2358
+#: build/trans_presets.java:2374 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2614 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "Opening Hours"
 msgstr "开放时间"
@@ -24748,47 +24945,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2472 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2584
-#: build/trans_presets.java:2593 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2485 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2597
+#: build/trans_presets.java:2606 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "24/7"
 msgstr "7*24 小时"
@@ -24880,47 +25077,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2361
-#: build/trans_presets.java:2398 build/trans_presets.java:2414
-#: build/trans_presets.java:2438 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2624 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:3332
-#: build/trans_presets.java:3340 build/trans_presets.java:3389
-#: build/trans_presets.java:3396 build/trans_presets.java:3403
-#: build/trans_presets.java:3411 build/trans_presets.java:3418
-#: build/trans_presets.java:3427 build/trans_presets.java:3436
-#: build/trans_presets.java:3443 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3468
-#: build/trans_presets.java:3476 build/trans_presets.java:3482
-#: build/trans_presets.java:3490 build/trans_presets.java:3499
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3548 build/trans_presets.java:3556
-#: build/trans_presets.java:3562 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3586
-#: build/trans_presets.java:3592 build/trans_presets.java:3602
-#: build/trans_presets.java:3610 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3643
-#: build/trans_presets.java:3649 build/trans_presets.java:3655
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
-#: build/trans_presets.java:3681 build/trans_presets.java:3688
-#: build/trans_presets.java:3696 build/trans_presets.java:3703
-#: build/trans_presets.java:3712 build/trans_presets.java:3719
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3753
-#: build/trans_presets.java:3762 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3790 build/trans_presets.java:3799
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2374
+#: build/trans_presets.java:2411 build/trans_presets.java:2427
+#: build/trans_presets.java:2451 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2637 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:3345
+#: build/trans_presets.java:3353 build/trans_presets.java:3402
+#: build/trans_presets.java:3409 build/trans_presets.java:3416
+#: build/trans_presets.java:3424 build/trans_presets.java:3431
+#: build/trans_presets.java:3440 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3495
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3575 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3599
+#: build/trans_presets.java:3605 build/trans_presets.java:3615
+#: build/trans_presets.java:3623 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3656
+#: build/trans_presets.java:3662 build/trans_presets.java:3668
+#: build/trans_presets.java:3677 build/trans_presets.java:3686
+#: build/trans_presets.java:3694 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3725 build/trans_presets.java:3732
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3766
+#: build/trans_presets.java:3775 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3797
+#: build/trans_presets.java:3803 build/trans_presets.java:3812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "周一-周五 08:30-20:00"
@@ -24990,126 +25187,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3443
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3719
-#: build/trans_presets.java:3753 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3790
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3456
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3732
+#: build/trans_presets.java:3766 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3803
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "周二-周日 08:00-15:00；周六 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "With shop"
 msgstr "带商店"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "convenience"
 msgstr "便利店"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "kiosk"
 msgstr "售货亭"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1615
 msgid "Fuel types:"
 msgstr "燃油类型："
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1616
 msgid "Diesel"
 msgstr "柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1617
 msgid "Bio Diesel"
 msgstr "生物柴油"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1618
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "柴油 (天然气合成)"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "重型货车用柴油"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1620
 msgid "Octane 91"
 msgstr "91 号汽油"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1621
 msgid "Octane 95"
 msgstr "95 号汽油"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1622
 msgid "Octane 98"
 msgstr "98 号汽油"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1623
 msgid "Octane 100"
 msgstr "100 号汽油"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1624
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (添加 10% 乙醇)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1625
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (添加 85% 乙醇)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1626
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "液化石油气"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1627
 msgid "CNG (Compressed Natural Gas)"
 msgstr "压缩天然气"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1628
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1629
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25117,5 +25314,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1632
 msgid "Charging Station"
 msgstr "充电站"
@@ -25123,20 +25320,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1634
 msgid "Edit Charging Station (for electric cars)"
 msgstr "编辑充电站(为电动车)"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1638
 msgid "Amperage"
 msgstr "安培数"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1640
 msgid "Wash"
 msgstr "洗车场"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "编辑"
@@ -25144,5 +25341,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1649
 msgid "Car Dealer"
 msgstr "汽车经销商"
@@ -25150,5 +25347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1651
 msgid "Edit Car Shop"
 msgstr "编辑汽车商店"
@@ -25156,20 +25353,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1644 build/trans_presets.java:1706
+#: build/trans_presets.java:1656 build/trans_presets.java:1719
 msgid "Repair"
 msgstr "修车场"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1657
 msgid "Edit Car Repair"
 msgstr "编辑修车场"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1664
 msgid "Tyres"
 msgstr "补胎处"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr "编辑补胎处"
@@ -25177,5 +25374,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1659 build/trans_presets.java:1711
+#: build/trans_presets.java:1671 build/trans_presets.java:1724
 msgid "Contact:"
 msgstr "联系方式："
@@ -25219,15 +25416,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1660 build/trans_presets.java:1712
-#: build/trans_presets.java:1945 build/trans_presets.java:1963
-#: build/trans_presets.java:1979 build/trans_presets.java:1996
-#: build/trans_presets.java:2014 build/trans_presets.java:2031
-#: build/trans_presets.java:2053 build/trans_presets.java:2070
-#: build/trans_presets.java:2093 build/trans_presets.java:2112
-#: build/trans_presets.java:2129 build/trans_presets.java:2148
-#: build/trans_presets.java:2167 build/trans_presets.java:2183
-#: build/trans_presets.java:2200 build/trans_presets.java:2215
-#: build/trans_presets.java:2448 build/trans_presets.java:2613
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:1672 build/trans_presets.java:1725
+#: build/trans_presets.java:1958 build/trans_presets.java:1976
+#: build/trans_presets.java:1992 build/trans_presets.java:2009
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2066 build/trans_presets.java:2083
+#: build/trans_presets.java:2106 build/trans_presets.java:2125
+#: build/trans_presets.java:2142 build/trans_presets.java:2161
+#: build/trans_presets.java:2180 build/trans_presets.java:2196
+#: build/trans_presets.java:2213 build/trans_presets.java:2228
+#: build/trans_presets.java:2461 build/trans_presets.java:2626
+#: build/trans_presets.java:4261
 msgid "Phone Number"
 msgstr "电话号码"
@@ -25252,18 +25449,19 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1661 build/trans_presets.java:1713
-#: build/trans_presets.java:1946 build/trans_presets.java:1964
-#: build/trans_presets.java:1980 build/trans_presets.java:1997
-#: build/trans_presets.java:2015 build/trans_presets.java:2032
-#: build/trans_presets.java:2054 build/trans_presets.java:2071
-#: build/trans_presets.java:2094 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2149
-#: build/trans_presets.java:2168 build/trans_presets.java:2184
-#: build/trans_presets.java:2201 build/trans_presets.java:2216
-#: build/trans_presets.java:4249
+#: build/trans_presets.java:1673 build/trans_presets.java:1726
+#: build/trans_presets.java:1959 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2028 build/trans_presets.java:2045
+#: build/trans_presets.java:2067 build/trans_presets.java:2084
+#: build/trans_presets.java:2107 build/trans_presets.java:2126
+#: build/trans_presets.java:2143 build/trans_presets.java:2162
+#: build/trans_presets.java:2181 build/trans_presets.java:2197
+#: build/trans_presets.java:2214 build/trans_presets.java:2229
+#: build/trans_presets.java:4262
 msgid "Fax Number"
 msgstr "传真号码"
 
 #. item "Car/Tyres" text "Website"
+#. item "Car/Sharing" text "Website"
 #. item "Motorcycle/Motorcycle Dealer" text "Website"
 #. item "Facilities/Accommodation/Hotel" text "Website"
@@ -25286,14 +25484,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1662 build/trans_presets.java:1714
-#: build/trans_presets.java:1947 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1998
-#: build/trans_presets.java:2016 build/trans_presets.java:2033
-#: build/trans_presets.java:2055 build/trans_presets.java:2072
-#: build/trans_presets.java:2095 build/trans_presets.java:2114
-#: build/trans_presets.java:2131 build/trans_presets.java:2150
-#: build/trans_presets.java:2169 build/trans_presets.java:2185
-#: build/trans_presets.java:2202 build/trans_presets.java:2217
-#: build/trans_presets.java:2449 build/trans_presets.java:4251
+#: build/trans_presets.java:1674 build/trans_presets.java:1696
+#: build/trans_presets.java:1727 build/trans_presets.java:1960
+#: build/trans_presets.java:1978 build/trans_presets.java:1994
+#: build/trans_presets.java:2011 build/trans_presets.java:2029
+#: build/trans_presets.java:2046 build/trans_presets.java:2068
+#: build/trans_presets.java:2085 build/trans_presets.java:2108
+#: build/trans_presets.java:2127 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2182
+#: build/trans_presets.java:2198 build/trans_presets.java:2215
+#: build/trans_presets.java:2230 build/trans_presets.java:2462
+#: build/trans_presets.java:4264
 msgid "Website"
 msgstr "网址"
@@ -25318,14 +25517,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1663 build/trans_presets.java:1715
-#: build/trans_presets.java:1948 build/trans_presets.java:1966
-#: build/trans_presets.java:1982 build/trans_presets.java:1999
-#: build/trans_presets.java:2017 build/trans_presets.java:2034
-#: build/trans_presets.java:2056 build/trans_presets.java:2073
-#: build/trans_presets.java:2096 build/trans_presets.java:2115
-#: build/trans_presets.java:2132 build/trans_presets.java:2151
-#: build/trans_presets.java:2170 build/trans_presets.java:2186
-#: build/trans_presets.java:2203 build/trans_presets.java:2218
-#: build/trans_presets.java:4252
+#: build/trans_presets.java:1675 build/trans_presets.java:1728
+#: build/trans_presets.java:1961 build/trans_presets.java:1979
+#: build/trans_presets.java:1995 build/trans_presets.java:2012
+#: build/trans_presets.java:2030 build/trans_presets.java:2047
+#: build/trans_presets.java:2069 build/trans_presets.java:2086
+#: build/trans_presets.java:2109 build/trans_presets.java:2128
+#: build/trans_presets.java:2145 build/trans_presets.java:2164
+#: build/trans_presets.java:2183 build/trans_presets.java:2199
+#: build/trans_presets.java:2216 build/trans_presets.java:2231
+#: build/trans_presets.java:4265
 msgid "Email Address"
 msgstr "电子邮件地址"
@@ -25335,6 +25534,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1666 build/trans_presets.java:1705
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1678 build/trans_presets.java:1718
+#: build/trans_presets.java:1753
 msgid "Rental"
 msgstr "租车"
@@ -25343,10 +25542,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1681
 msgid "Edit Car Rental"
 msgstr "编辑租车"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1688
 msgid "Sharing"
 msgstr "共享"
@@ -25354,21 +25553,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1690
 msgid "Edit Car Sharing"
 msgstr "编辑汽车共享"
 
+#. item "Car/Sharing" text "Capacity"
+#. item "Motorcycle/Parking" text "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1693 build/trans_presets.java:1704
+#: build/trans_presets.java:1737
+msgid "Capacity"
+msgstr "容量"
+
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1701
 msgid "Edit Motorcycle Parking"
 msgstr "编辑摩托车停车场"
 
-#. item "Motorcycle/Parking" text "Capacity"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1691 build/trans_presets.java:1724
-msgid "Capacity"
-msgstr "容量"
-
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1708
 msgid "Motorcycle Dealer"
 msgstr "摩托车经销商"
@@ -25376,25 +25577,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1710
 msgid "Edit Shop Motorcycle"
 msgstr "编辑摩托车商店"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1713
 msgid "independent"
 msgstr "个体"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1716
 msgid "Services:"
 msgstr "服务："
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgid "Sale"
 msgstr "减价"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "yes"
@@ -25402,5 +25603,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "brand"
@@ -25408,5 +25609,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "used"
@@ -25414,5 +25615,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "no"
@@ -25423,6 +25624,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
 msgid "brand"
 msgstr "品牌"
@@ -25430,35 +25631,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1706 build/trans_presets.java:1708
+#: build/trans_presets.java:1719 build/trans_presets.java:1721
 msgid "oldtimer"
 msgstr "过时的"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "Safety inspection"
 msgstr "安全检查"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "DEKRA"
 msgstr "德国机动车监督协会"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "GTÜ"
 msgstr "德国技术检验协会"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "MOT"
 msgstr "旧车性能检测"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1721
 msgid "Parts"
 msgstr "零件"
@@ -25468,6 +25669,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2678
-#: build/trans_presets.java:3485 build/trans_presets.java:3486
+#: build/trans_presets.java:1722 build/trans_presets.java:2691
+#: build/trans_presets.java:3498 build/trans_presets.java:3499
 msgid "Clothes"
 msgstr "服装店"
@@ -25475,10 +25676,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1734
 msgid "Edit Bicycle Parking"
 msgstr "编辑自行车停车场"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1739
 msgid "Bike Dealer"
 msgstr "自行车经销商"
@@ -25487,40 +25688,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1742
 msgid "Edit Bicycle Shop"
 msgstr "编辑自行车商店"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1745
 msgid "Bicycles are sold"
 msgstr "出售自行车"
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1746
 msgid "Second-hand bicycles are sold"
 msgstr "出售二手自行车"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1747
 msgid "Bicycles are repaired"
 msgstr "修理自行车"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1748
 msgid "Bicycles are rented"
 msgstr "出租自行车"
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1749
 msgid "Free bicycle pump"
 msgstr "免费使用打气筒"
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1750
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr "自行修理的工具(也许是一个自行车合作社)"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1751
 msgid "Bicycles are washed (for a fee)"
 msgstr "清洗自行车(收费)"
@@ -25529,10 +25730,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1756
 msgid "Edit Bicycle Rental"
 msgstr "编辑自行车租用点"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1761
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -25540,5 +25741,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1762
 msgctxt "railway"
 msgid "Station"
@@ -25548,5 +25749,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1765
 msgctxt "railway"
 msgid "Edit Station"
@@ -25554,5 +25755,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1770
 msgid "UIC-Reference"
 msgstr "国际铁路联盟编号"
@@ -25560,5 +25761,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1773
 msgid "Railway Halt"
 msgstr "铁路停靠站"
@@ -25566,5 +25767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1775
 msgid "Edit Halt"
 msgstr "编辑停靠站"
@@ -25572,5 +25773,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1782
 msgid "Tram Stop"
 msgstr "有轨电车停靠站"
@@ -25579,5 +25780,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1785
 msgid "Edit Tram Stop"
 msgstr "编辑有轨电车停靠站"
@@ -25585,5 +25786,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1792
 msgid "Railway Platform"
 msgstr "铁路月台"
@@ -25592,5 +25793,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1795
 msgid "Edit Railway Platform"
 msgstr "编辑铁路月台"
@@ -25602,5 +25803,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1785 build/trans_presets.java:1830
+#: build/trans_presets.java:1798 build/trans_presets.java:1843
 msgid "Reference (track number)"
 msgstr "编号 (轨道号)"
@@ -25609,11 +25810,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1787 build/trans_presets.java:1832
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:1800 build/trans_presets.java:1845
+#: build/trans_presets.java:2349
 msgid "Area"
 msgstr "区域"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1802
 msgid "Subway Entrance"
 msgstr "地铁入口"
@@ -25622,5 +25823,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1805
 msgid "Edit Subway Entrance"
 msgstr "编辑地铁入口"
@@ -25628,5 +25829,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1797 build/trans_presets.java:2635
+#: build/trans_presets.java:1810 build/trans_presets.java:2648
 msgid "Wheelchair"
 msgstr "轮椅"
@@ -25635,5 +25836,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1815
 msgid "Bus Station"
 msgstr "公交车车站"
@@ -25642,5 +25843,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1818
 msgid "Edit Bus Station"
 msgstr "编辑公交车车站"
@@ -25648,5 +25849,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1824
 msgid "Bus Stop"
 msgstr "公交车停靠站"
@@ -25656,5 +25857,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1828
 msgid "Edit Bus Stop"
 msgstr "编辑公交车停靠站"
@@ -25663,6 +25864,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1820 build/trans_presets.java:2698
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:1833 build/trans_presets.java:2711
+#: build/trans_presets.java:2722
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -25674,10 +25875,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1821 build/trans_presets.java:2690
+#: build/trans_presets.java:1834 build/trans_presets.java:2703
 msgid "Bench"
 msgstr "长椅"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1835
 msgid "Tactile Paving"
 msgstr "盲道"
@@ -25685,10 +25886,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1839
 msgid "Bus Platform"
 msgstr "公交车月台"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1840
 msgid "Edit Bus Platform"
 msgstr "编辑公交车月台"
@@ -25696,10 +25897,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1848
 msgid "Ticket Machine"
 msgstr "自动售票机"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1854
 msgid "Reference Number"
 msgstr "编号"
@@ -25708,6 +25909,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1842 build/trans_presets.java:2649
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:1855 build/trans_presets.java:2662
+#: build/trans_presets.java:3823
 msgid "Coins"
 msgstr "硬币"
@@ -25716,6 +25917,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1843 build/trans_presets.java:2650
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:1856 build/trans_presets.java:2663
+#: build/trans_presets.java:3824
 msgid "Notes"
 msgstr "纸币"
@@ -25724,6 +25925,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1844 build/trans_presets.java:2651
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1857 build/trans_presets.java:2664
+#: build/trans_presets.java:3825
 msgid "Electronic purses and Charge cards"
 msgstr "电子钱包或收费卡"
@@ -25732,6 +25933,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1845 build/trans_presets.java:2652
-#: build/trans_presets.java:3813
+#: build/trans_presets.java:1858 build/trans_presets.java:2665
+#: build/trans_presets.java:3826
 msgid "Debit cards"
 msgstr "借记卡"
@@ -25740,6 +25941,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1846 build/trans_presets.java:2653
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:1859 build/trans_presets.java:2666
+#: build/trans_presets.java:3827
 msgid "Credit cards"
 msgstr "信用卡"
@@ -25747,10 +25948,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1847 build/trans_presets.java:3815
+#: build/trans_presets.java:1860 build/trans_presets.java:3828
 msgid "Account or loyalty cards"
 msgstr "帐号或会员卡"
 
 #. item "Taxi"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1863
 msgid "Taxi"
 msgstr "出租车"
@@ -25758,5 +25959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1865
 msgid "Edit Taxi station"
 msgstr "编辑出租车招呼站"
@@ -25764,10 +25965,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1870
 msgid "Airport"
 msgstr "机场"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1871
 msgid "Airport Ground"
 msgstr "机场"
@@ -25775,5 +25976,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1873
 msgid "Edit Airport Ground"
 msgstr "编辑机场"
@@ -25781,10 +25982,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1877
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1878
 msgid "ICAO"
 msgstr "ICAO"
@@ -25793,5 +25994,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1883
 msgid "Runway"
 msgstr "跑道"
@@ -25799,5 +26000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1885
 msgid "Edit Runway"
 msgstr "编辑跑道"
@@ -25805,5 +26006,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1891
 msgid "Taxiway"
 msgstr "滑行道"
@@ -25811,5 +26012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1893
 msgid "Edit Taxiway"
 msgstr "编辑滑行道"
@@ -25817,5 +26018,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1899
 msgid "Helipad"
 msgstr "直升机停机坪"
@@ -25823,5 +26024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1901
 msgid "Edit Helipad"
 msgstr "编辑直升机停机坪"
@@ -25831,5 +26032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1894 build/trans_presets.java:1896
+#: build/trans_presets.java:1907 build/trans_presets.java:1909
 msgid "Apron"
 msgstr "停机坪"
@@ -25839,5 +26040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1899 build/trans_presets.java:1901
+#: build/trans_presets.java:1912 build/trans_presets.java:1914
 msgid "Hangar"
 msgstr "飞机库"
@@ -25848,6 +26049,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1904 build/trans_presets.java:1906
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:1917 build/trans_presets.java:1919
+#: build/trans_presets.java:3217
 msgid "Beacon"
 msgstr "灯标"
@@ -25857,5 +26058,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1909 build/trans_presets.java:1911
+#: build/trans_presets.java:1922 build/trans_presets.java:1924
 msgid "Windsock"
 msgstr "风向袋"
@@ -25864,5 +26065,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1928
 msgid "Terminal"
 msgstr "航站楼"
@@ -25870,10 +26071,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1930
 msgid "Edit Terminal"
 msgstr "编辑航站楼"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1934
 msgctxt "airport"
 msgid "Gate"
@@ -25882,15 +26083,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1936
 msgid "Edit Terminal Gate"
 msgstr "编辑登机口"
 
 #. group "Facilities"
-#: build/trans_presets.java:1929 build/trans_presets.java:2627
+#: build/trans_presets.java:1942 build/trans_presets.java:2640
 msgid "Facilities"
 msgstr "公共场所"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1943
 msgid "Accommodation"
 msgstr "住宿"
@@ -25902,5 +26103,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1931 build/trans_surveyor.java:43
+#: build/trans_presets.java:1944 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅馆"
@@ -25909,5 +26110,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1947
 msgid "Edit Hotel"
 msgstr "编辑旅馆"
@@ -25921,8 +26122,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1938 build/trans_presets.java:1956
-#: build/trans_presets.java:1972 build/trans_presets.java:1989
-#: build/trans_presets.java:2007 build/trans_presets.java:2041
-#: build/trans_presets.java:2063 build/trans_presets.java:2086
+#: build/trans_presets.java:1951 build/trans_presets.java:1969
+#: build/trans_presets.java:1985 build/trans_presets.java:2002
+#: build/trans_presets.java:2020 build/trans_presets.java:2054
+#: build/trans_presets.java:2076 build/trans_presets.java:2099
 msgid "Stars"
 msgstr "星级"
@@ -25958,12 +26159,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "Internet access"
 msgstr "网络接入"
@@ -25984,12 +26185,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wlan"
 msgstr "无线"
@@ -26010,12 +26211,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wired"
 msgstr "有线"
@@ -26042,12 +26243,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195 build/trans_style.java:1069
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208 build/trans_style.java:1069
 msgid "terminal"
 msgstr "航站楼"
@@ -26068,12 +26269,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1941 build/trans_presets.java:1959
-#: build/trans_presets.java:1975 build/trans_presets.java:1992
-#: build/trans_presets.java:2010 build/trans_presets.java:2027
-#: build/trans_presets.java:2044 build/trans_presets.java:2066
-#: build/trans_presets.java:2089 build/trans_presets.java:2108
-#: build/trans_presets.java:2125 build/trans_presets.java:2144
-#: build/trans_presets.java:2163 build/trans_presets.java:2179
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "Internet access fee"
 msgstr "收费网络接入"
@@ -26096,12 +26297,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "Smoking"
 msgstr "吸烟"
@@ -26123,12 +26324,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "dedicated"
 msgstr "专用"
@@ -26150,12 +26351,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "separated"
 msgstr "隔离"
@@ -26177,17 +26378,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "isolated"
 msgstr "远离"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1963
 msgid "Motel"
 msgstr "汽车旅馆"
@@ -26195,20 +26396,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1965
 msgid "Edit Motel"
 msgstr "编辑汽车旅馆"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1981
 msgid "Guest House"
 msgstr "宾馆/招待所"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1982
 msgid "Edit Guest House"
 msgstr "编辑宾馆/招待所"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1997
 msgid "Chalet"
 msgstr "小木屋"
@@ -26216,10 +26417,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1999
 msgid "Edit Chalet"
 msgstr "编辑小木屋"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2014
 msgid "Hostel"
 msgstr "招待所"
@@ -26227,15 +26428,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2016
 msgid "Edit Hostel"
 msgstr "编辑招待所"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2032
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2033
 msgid "Edit Alpine Hut"
 msgstr "编辑高山小屋"
@@ -26243,10 +26444,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2050
 msgid "Caravan Site"
 msgstr "拖车营地"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2051
 msgid "Edit Caravan Site"
 msgstr "编辑拖车营地"
@@ -26254,30 +26455,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2061
 msgid "Number of places"
 msgstr "营地编码"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "Requires a fee"
 msgstr "需要费用"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "interval"
 msgstr "时间分段"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2063
 msgid "Power supply"
 msgstr "电源"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2064
 msgid "Tents allowed"
 msgstr "允许帐篷"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2071
 msgid "Camping Site"
 msgstr "露营区"
@@ -26285,10 +26486,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2073
 msgid "Edit Camping Site"
 msgstr "编辑露营区"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2089
 msgid "Food+Drinks"
 msgstr "食物+饮料"
@@ -26299,5 +26500,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2077 build/trans_surveyor.java:47
+#: build/trans_presets.java:2090 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐厅"
@@ -26305,5 +26506,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2092
 msgid "Edit Restaurant"
 msgstr "编辑餐厅"
@@ -26312,6 +26513,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2153
 msgid "Cuisine"
 msgstr "烹调风格"
@@ -26319,5 +26520,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "italian"
 msgstr "意式"
@@ -26325,5 +26526,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "chinese"
 msgstr "中式"
@@ -26331,5 +26532,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "pizza"
 msgstr "披萨"
@@ -26337,5 +26538,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "burger"
 msgstr "汉堡"
@@ -26343,5 +26544,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "greek"
 msgstr "希腊式"
@@ -26349,5 +26550,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "german"
 msgstr "德式"
@@ -26355,5 +26556,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "indian"
 msgstr "印式"
@@ -26361,5 +26562,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "regional"
 msgstr "本地"
@@ -26367,5 +26568,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "kebab"
 msgstr "土耳其烤肉"
@@ -26373,5 +26574,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "turkish"
 msgstr "土耳其式"
@@ -26379,5 +26580,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "asian"
 msgstr "亚式"
@@ -26385,5 +26586,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "thai"
 msgstr "泰式"
@@ -26391,5 +26592,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "mexican"
 msgstr "墨西哥式"
@@ -26397,5 +26598,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "japanese"
 msgstr "日式"
@@ -26403,5 +26604,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "french"
 msgstr "法式"
@@ -26409,5 +26610,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sandwich"
 msgstr "三明治"
@@ -26415,5 +26616,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sushi"
 msgstr "寿司"
@@ -26421,10 +26622,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2084 build/trans_presets.java:2159
+#: build/trans_presets.java:2097 build/trans_presets.java:2172
 msgid "Microbrewery"
 msgstr "自酿酒"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2111
 msgid "Fast Food"
 msgstr "快餐"
@@ -26432,20 +26633,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2113
 msgid "Edit Fast Food Restaurant"
 msgstr "编辑快餐餐厅"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "fish_and_chips"
 msgstr "鱼和薯条"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "chicken"
 msgstr "鸡肉"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2130
 msgid "Food Court"
 msgstr "美食广场"
@@ -26453,10 +26654,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2132
 msgid "Edit Food Court"
 msgstr "编辑美食广场"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2147
 msgid "Cafe"
 msgstr "咖啡"
@@ -26464,15 +26665,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2149
 msgid "Edit Cafe"
 msgstr "编辑咖啡厅"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2153
 msgid "ice_cream"
 msgstr "冰激凌"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2166
 msgid "Pub"
 msgstr "酒店"
@@ -26480,20 +26681,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2168
 msgid "Edit Pub"
 msgstr "编辑酒店"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2185
 msgid "Biergarten"
 msgstr "露天啤酒馆"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2186
 msgid "Edit Biergarten"
 msgstr "编辑露天啤酒馆"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2201
 msgid "Bar"
 msgstr "酒吧"
@@ -26501,10 +26702,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2203
 msgid "Edit Bar"
 msgstr "编辑酒吧"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2218
 msgid "Nightclub"
 msgstr "夜店"
@@ -26512,25 +26713,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2220
 msgid "Edit Nightclub"
 msgstr "编辑夜店"
 
 #. group "Tourism"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2234
 msgid "Tourism"
 msgstr "旅游相关"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2235
 msgid "Attraction"
 msgstr "景点"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2236
 msgid "Edit Attraction"
 msgstr "编辑景点"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2241
 msgid "Viewpoint"
 msgstr "景点"
@@ -26538,10 +26739,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2243
 msgid "Edit Viewpoint"
 msgstr "编辑景点"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2246
 msgid "Look-Out Tower"
 msgstr "眺望塔"
@@ -26549,20 +26750,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2249
 msgid "Information Office"
 msgstr "信息服务处"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2256
 msgid "Map"
 msgstr "地图"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "Detail Grade"
 msgstr "详细等级"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "topo"
 msgstr "场所"
@@ -26595,5 +26796,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2248 build/trans_presets.java:4388
+#: build/trans_presets.java:2261 build/trans_presets.java:4401
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -26602,25 +26803,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "scheme"
 msgstr "设计图"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "Shown Area"
 msgstr "显示区域"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "site"
 msgstr "地点"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "city"
 msgstr "城市"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "region"
 msgstr "地区"
@@ -26629,6 +26830,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2250 build/trans_presets.java:2266
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2263 build/trans_presets.java:2279
+#: build/trans_presets.java:2323
 msgid "Closer Description"
 msgstr "贴切描述"
@@ -26638,5 +26839,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2252 build/trans_presets.java:2275
+#: build/trans_presets.java:2265 build/trans_presets.java:2288
 msgid "Routes shown for:"
 msgstr "显示的线路为了："
@@ -26644,5 +26845,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2253 build/trans_presets.java:2276
+#: build/trans_presets.java:2266 build/trans_presets.java:2289
 msgid "Hiking"
 msgstr "健走"
@@ -26651,6 +26852,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2254 build/trans_presets.java:2277
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2267 build/trans_presets.java:2290
+#: build/trans_presets.java:2840
 msgid "Cycling"
 msgstr "自行车"
@@ -26658,5 +26859,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2255 build/trans_presets.java:2278
+#: build/trans_presets.java:2268 build/trans_presets.java:2291
 msgid "Mountainbiking"
 msgstr "山地自行车"
@@ -26665,6 +26866,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2256 build/trans_presets.java:2279
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2269 build/trans_presets.java:2292
+#: build/trans_presets.java:2888
 msgid "Skiing"
 msgstr "滑雪"
@@ -26672,5 +26873,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2257 build/trans_presets.java:2280
+#: build/trans_presets.java:2270 build/trans_presets.java:2293
 msgid "Riding"
 msgstr "骑行"
@@ -26678,50 +26879,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2258 build/trans_presets.java:2281
+#: build/trans_presets.java:2271 build/trans_presets.java:2294
 msgid "... other transportation modes possible"
 msgstr "... 其他运输方式也可被接受"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2273
 msgid "Information Board"
 msgstr "信息板"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "Board Content"
 msgstr "信息板内容"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "notice"
 msgstr "提示"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "history"
 msgstr "历史"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "nature"
 msgstr "自然"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "wildlife"
 msgstr "野生"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2281
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2296
 msgid "Information Terminal"
 msgstr "信息终端机"
@@ -26729,10 +26930,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2288 build/trans_presets.java:2298
+#: build/trans_presets.java:2301 build/trans_presets.java:2311
 msgid "Closer description"
 msgstr "贴切描述"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2306
 msgid "Audioguide"
 msgstr "语音导览"
@@ -26740,25 +26941,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2316
 msgid "Audioguide via mobile phone?"
 msgstr "在手机上的语音导览？"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2317
 msgid "Phone number"
 msgstr "电话号码"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2319
 msgid "Other Information Points"
 msgstr "其他的信息点"
 
 #. group "Leisure"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2326
 msgid "Leisure"
 msgstr "休闲"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2327
 msgid "Cinema"
 msgstr "电影院"
@@ -26767,10 +26968,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2330
 msgid "Edit Cinema"
 msgstr "编辑电影院"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2334
 msgid "Zoo"
 msgstr "动物园"
@@ -26779,10 +26980,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2337
 msgid "Edit Zoo"
 msgstr "编辑动物园"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2343
 msgid "Dog Park"
 msgstr ""
@@ -26791,45 +26992,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2346
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "Barrier"
 msgstr "障碍物"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "fence"
 msgstr "栅栏"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "wall"
 msgstr "墙"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2354
 msgid "Theme Park"
 msgstr "主题乐园"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2355
 msgid "Edit Theme Park"
 msgstr "编辑主题乐园"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2360
 msgid "Water Park"
 msgstr "水上乐园"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2361
 msgid "Edit Water Park"
 msgstr "编辑水上乐园"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2365
 msgid "Sauna"
 msgstr "桑拿"
@@ -26839,5 +27040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2353 build/trans_presets.java:2356
+#: build/trans_presets.java:2366 build/trans_presets.java:2369
 msgid "Edit Sauna"
 msgstr "编辑桑拿"
@@ -26865,20 +27066,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2361 build/trans_presets.java:2472
-#: build/trans_presets.java:2593 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3499
-#: build/trans_presets.java:3548 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3712
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3762
-#: build/trans_presets.java:3784 build/trans_presets.java:3799
+#: build/trans_presets.java:2374 build/trans_presets.java:2485
+#: build/trans_presets.java:2606 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3512
+#: build/trans_presets.java:3561 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3725
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3775
+#: build/trans_presets.java:3797 build/trans_presets.java:3812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "周二-周日 08:00-15:00；周六 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2375
 msgid "Access"
 msgstr "通行"
@@ -26886,5 +27087,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2378
 msgid "Playground"
 msgstr "运动场"
@@ -26892,15 +27093,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2380
 msgid "Edit Playground"
 msgstr "编辑运动场"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2384
 msgid "Picnic Site"
 msgstr "野餐区"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2385
 msgid "Edit Picnic Site"
 msgstr "编辑野餐区"
@@ -26908,10 +27109,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2375 build/trans_presets.java:2702
+#: build/trans_presets.java:2388 build/trans_presets.java:2715
 msgid "Fireplace"
 msgstr "壁炉"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2390
 msgid "Public Grill"
 msgstr "公共烧烤区"
@@ -26919,15 +27120,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2392
 msgid "Edit Public Grill"
 msgstr "编辑公共烧烤区"
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2396
 msgid "Covered"
 msgstr "有遮盖"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgctxt "grill"
 msgid "Fuel"
@@ -26935,30 +27136,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "charcoal"
 msgstr "木炭"
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "electric"
 msgstr "电"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2399
 msgid "Fishing"
 msgstr "钓鱼"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2400
 msgid "Edit Fishing"
 msgstr "编辑钓鱼场"
 
 #. group "Culture"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2405
 msgid "Culture"
 msgstr "文化"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2406
 msgid "Museum"
 msgstr "博物馆"
@@ -26966,10 +27167,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2408
 msgid "Edit Museum"
 msgstr "编辑博物馆"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2414
 msgid "Theatre"
 msgstr "剧院"
@@ -26978,10 +27179,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2417
 msgid "Edit Theatre"
 msgstr "编辑剧院"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2421
 msgid "Library"
 msgstr "图书馆"
@@ -26990,10 +27191,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2424
 msgid "Edit Library"
 msgstr "编辑图书馆"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2429
 msgid "Arts Centre"
 msgstr "美术馆"
@@ -27001,10 +27202,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2431
 msgid "Edit Arts Centre"
 msgstr "编辑美术馆"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2435
 msgid "Artwork"
 msgstr "艺术工作"
@@ -27012,12 +27213,12 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2437
 msgid "Edit Artwork"
 msgstr "编辑艺术工作"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2441
 msgid "Place of Worship"
-msgstr "宗教仪式场所"
+msgstr "宗教场所"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -27025,13 +27226,13 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2445
 msgid "Edit Place of Worship"
-msgstr "编辑宗教仪式场所"
+msgstr "编辑宗教场所"
 
 #. item "Culture/Place of Worship" combo "Religion"
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "Religion"
 msgstr "宗教"
@@ -27040,6 +27241,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "bahai"
 msgstr "巴海大同教"
@@ -27048,6 +27249,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "buddhist"
 msgstr "佛教"
@@ -27056,6 +27257,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "christian"
 msgstr "基督教系"
@@ -27064,6 +27265,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "hindu"
 msgstr "印度教"
@@ -27072,6 +27273,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jain"
 msgstr "耆那教"
@@ -27080,6 +27281,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jewish"
 msgstr "犹太教"
@@ -27088,6 +27289,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "muslim"
 msgstr "伊斯兰教"
@@ -27096,6 +27297,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "sikh"
 msgstr "锡克教"
@@ -27104,6 +27305,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "spiritualist"
 msgstr "巫术"
@@ -27112,6 +27313,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "taoist"
 msgstr "道教"
@@ -27120,6 +27321,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "unitarian"
 msgstr "一位论派基督教"
@@ -27128,6 +27329,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "zoroastrian"
 msgstr "祆教"
@@ -27136,6 +27337,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "Denomination"
 msgstr "教派"
@@ -27144,6 +27345,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "anglican"
 msgstr "英国国教"
@@ -27152,6 +27353,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "baptist"
 msgstr "浸信会"
@@ -27160,6 +27361,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "catholic"
 msgstr "天主教"
@@ -27168,6 +27369,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "evangelical"
 msgstr "福音派"
@@ -27176,6 +27377,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jehovahs_witness"
 msgstr "耶和华见证"
@@ -27184,6 +27385,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "lutheran"
 msgstr "路德派"
@@ -27192,6 +27393,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "methodist"
 msgstr "卫理公会教"
@@ -27200,6 +27401,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "mormon"
 msgstr "摩门教"
@@ -27208,6 +27409,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "orthodox"
 msgstr "东正教"
@@ -27216,6 +27417,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "pentecostal"
 msgstr "圣灵降临派"
@@ -27224,6 +27425,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "presbyterian"
 msgstr "长老派"
@@ -27232,6 +27433,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "protestant"
 msgstr "新教"
@@ -27240,6 +27441,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "quaker"
 msgstr "教友派"
@@ -27248,6 +27449,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "shia"
 msgstr "什叶派"
@@ -27256,38 +27457,36 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "sunni"
 msgstr "逊尼派"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2437
-#, fuzzy
+#: build/trans_presets.java:2450
 msgid "Service Times"
-msgstr "服务站"
+msgstr "服务时间"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:00"
-msgstr ""
+msgstr "星期日 10:00"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:30"
-msgstr ""
+msgstr "星期日 10:30"
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 11:00"
-msgstr ""
+msgstr "星期日 11:00"
 
 #. item "Culture/Place of Worship" combo "Opening Hours for visiting"
-#: build/trans_presets.java:2438
-#, fuzzy
+#: build/trans_presets.java:2451
 msgid "Opening Hours for visiting"
-msgstr "开放时间"
+msgstr "参观时间"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2453
 msgid "Recording Studio"
 msgstr "录音室"
@@ -27295,15 +27494,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2455
 msgid "Edit Studio"
 msgstr "编辑录音室"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "audio"
 msgstr "音频"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "video"
 msgstr "视频"
@@ -27311,5 +27510,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2452 build/trans_presets.java:2453
+#: build/trans_presets.java:2465 build/trans_presets.java:2466
 msgid "Public Building"
 msgstr "公共建筑"
@@ -27317,10 +27516,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2468
 msgid "Edit Public Building"
 msgstr "编辑公共建筑"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2472
 msgid "Town hall"
 msgstr "县市政府/公所"
@@ -27328,5 +27527,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2474
 msgid "Edit Town hall"
 msgstr "编辑县市政府/公所"
@@ -27335,10 +27534,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2465 build/trans_presets.java:2467
+#: build/trans_presets.java:2478 build/trans_presets.java:2480
 msgid "Community Centre"
 msgstr "社区中心"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2487
 msgid "Embassy"
 msgstr "大使馆"
@@ -27346,10 +27545,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2489
 msgid "Edit Embassy"
 msgstr "编辑大使馆"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2493
 msgid "Courthouse"
 msgstr "法院"
@@ -27358,10 +27557,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2496
 msgid "Edit Courthouse"
 msgstr "编辑法院"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2500
 msgid "Prison"
 msgstr "监狱"
@@ -27370,10 +27569,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2503
 msgid "Edit Prison"
 msgstr "编辑监狱"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2507
 msgid "Police"
 msgstr "警察局"
@@ -27383,10 +27582,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2511
 msgid "Edit Police"
 msgstr "编辑警察局"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2515
 msgid "Fire Station"
 msgstr "消防队"
@@ -27395,10 +27594,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2518
 msgid "Edit Fire Station"
 msgstr "编辑消防队"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2522
 msgid "Post Office"
 msgstr "邮局"
@@ -27406,25 +27605,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2524
 msgid "Edit Post Office"
 msgstr "编辑邮局"
 
 #. group "Education"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2530
 msgid "Education"
 msgstr "教育"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2531
 msgid "Kindergarten"
 msgstr "幼儿园"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2532
 msgid "Edit Kindergarten"
 msgstr "编辑幼儿园"
 
 #. item "Education/School"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2536
 msgid "School"
 msgstr "学校"
@@ -27432,10 +27631,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2538
 msgid "Edit School"
 msgstr "编辑学校"
 
 #. item "Education/University"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2542
 msgid "University"
 msgstr "大学"
@@ -27443,10 +27642,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2544
 msgid "Edit University"
 msgstr "编辑大学"
 
 #. item "Education/College"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2548
 msgid "College"
 msgstr "学院"
@@ -27454,10 +27653,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2550
 msgid "Edit College"
 msgstr "编辑学院"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2554
 msgid "Driving School"
 msgstr "驾校"
@@ -27465,20 +27664,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2556
 msgid "Edit Driving School"
 msgstr "编辑驾校"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2561
 msgid "License Classes"
 msgstr "许可类型"
 
 #. group "Health"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2564
 msgid "Health"
 msgstr "健康"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2565
 msgid "Hospital"
 msgstr "医院"
@@ -27486,10 +27685,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2567
 msgid "Edit Hospital"
 msgstr "编辑医院"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2571
 msgid "Doctors"
 msgstr "医师"
@@ -27497,33 +27696,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2573
 msgid "Edit Doctors"
 msgstr "编辑医师"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2578
 msgid "Dentist"
 msgstr "牙医"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2579
 msgid "Edit Dentist"
 msgstr "编辑牙医"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2571
-#, fuzzy
+#: build/trans_presets.java:2584
 msgid "Nursing Home"
-msgstr "编号规则"
+msgstr "疗养院"
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2572
-#, fuzzy
+#: build/trans_presets.java:2585
 msgid "Edit Nursing Home"
-msgstr "编辑人行横道"
+msgstr "编辑疗养院"
 
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2591
 msgid "Pharmacy"
 msgstr "药局"
@@ -27531,5 +27728,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2593
 msgid "Edit Pharmacy"
 msgstr "编辑药局"
@@ -27537,10 +27734,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2595
 msgid "Dispensing"
 msgstr "配药"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2599
 msgid "Hearing Aids"
 msgstr "助听器"
@@ -27548,5 +27745,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2601
 msgid "Edit Hearing Aids"
 msgstr "编辑助听器"
@@ -27554,5 +27751,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2609
 msgid "Baby Hatch"
 msgstr "婴儿保育箱"
@@ -27560,5 +27757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2611
 msgid "Edit Baby Hatch"
 msgstr "编辑婴儿保育箱"
@@ -27566,5 +27763,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2617
 msgid "Emergency Access Point"
 msgstr "紧急连络点"
@@ -27573,5 +27770,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2620
 msgid "Edit Emergency Access Point"
 msgstr "编辑紧急连络点"
@@ -27580,15 +27777,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2623
 msgid "Point Number"
 msgstr "地点编号"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2624
 msgid "Point Name"
 msgstr "地点名"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2627
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用国际码，像是 +12-345-67890)"
@@ -27597,5 +27794,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2631
 msgid "Veterinary"
 msgstr "兽医"
@@ -27604,10 +27801,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2634
 msgid "Edit Veterinary"
 msgstr "编辑兽医"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2648
 msgid "limited"
 msgstr "有限"
@@ -27615,15 +27812,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2636 build/trans_presets.java:3809
+#: build/trans_presets.java:2649 build/trans_presets.java:3822
 msgid "Note"
 msgstr "注释"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2651
 msgid "Post Box"
 msgstr "邮筒"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2656
 msgid "Telephone"
 msgstr "电话"
@@ -27632,15 +27829,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2659
 msgid "Edit Telephone"
 msgstr "编辑电话"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2667
 msgid "Telephone cards"
 msgstr "电话卡"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2669
 msgid "Clock"
 msgstr "时钟"
@@ -27649,5 +27846,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2672
 msgid "Edit Clock"
 msgstr "编辑时钟"
@@ -27657,5 +27854,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgid "Display"
 msgstr "显示"
@@ -27663,6 +27860,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "analog"
@@ -27671,6 +27867,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "digital"
@@ -27678,6 +27873,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "sundial"
@@ -27685,67 +27879,66 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "unorthodox"
-msgstr "非标"
+msgstr "非主流"
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "Support"
 msgstr "支撑"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "pole"
 msgstr "杆"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "wall_mounted"
 msgstr "壁挂式"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "billboard"
 msgstr "告示牌"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "Visibility/readability"
 msgstr "可见性/可读性"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 5m)"
 msgstr "(高至 5 米)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 20m)"
 msgstr "(高至 20 米)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(more than 20m)"
 msgstr "(高于 20 米)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2678
 msgid "Shows current date"
 msgstr "显示当前日期"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2679
 msgid "Shows temperature"
 msgstr "显示温度"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2680
 msgid "Shows barometric pressure"
 msgstr "显示气压"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2681
 msgid "Shows humidity"
 msgstr "显示湿度"
@@ -27753,5 +27946,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2684
 msgid "Recycling"
 msgstr "资源回收"
@@ -27760,5 +27953,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2687
 msgid "Edit Recycling station"
 msgstr "编辑资源回收站"
@@ -27766,40 +27959,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2689
 msgid "Batteries"
 msgstr "电池"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2690
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2692
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2693
 msgid "Paper"
 msgstr "纸张"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2694
 msgid "Scrap Metal"
 msgstr "废金属"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "container"
 msgstr "箱子"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "centre"
 msgstr "中心"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2697
 msgid "Waste Basket"
 msgstr "垃圾桶"
@@ -27807,5 +28000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2699
 msgid "Edit Waste Basket"
 msgstr "编辑垃圾桶"
@@ -27814,30 +28007,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2706
 msgid "Backrest"
 msgstr "靠背"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "Material"
 msgstr "材质"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "stone"
 msgstr "石头"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "plastic"
 msgstr "塑胶"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgid "Colour"
 msgstr "颜色"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "black"
@@ -27845,5 +28038,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "brown"
@@ -27851,5 +28044,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "green"
@@ -27857,5 +28050,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "red"
@@ -27863,5 +28056,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "blue"
@@ -27869,5 +28062,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "gray"
@@ -27875,5 +28068,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "white"
@@ -27881,20 +28074,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2709
 msgid "Amount of Seats"
 msgstr "座椅数量"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2712
 msgid "Edit Shelter"
 msgstr "编辑庇护所"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgid "Type of shelter"
 msgstr "庇护所的类型"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -27902,5 +28095,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "public_transport"
@@ -27908,5 +28101,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -27914,5 +28107,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -27920,10 +28113,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2718
 msgid "Hunting Stand"
 msgstr "狩猎站"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2719
 msgid "Edit Hunting Stand"
 msgstr "编辑狩猎站"
@@ -27932,10 +28125,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2708 build/trans_presets.java:4000
+#: build/trans_presets.java:2721 build/trans_presets.java:4013
 msgid "Height"
 msgstr "高度"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -27943,20 +28136,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "half"
 msgstr "半高"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "full"
 msgstr "全高"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2723
 msgid "Hide"
 msgstr "隐藏"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2724
 msgid "Lock"
 msgstr "锁"
@@ -27964,5 +28157,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2727
 msgid "Drinking Water"
 msgstr "饮水机"
@@ -27971,10 +28164,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2730
 msgid "Edit Drinking Water"
 msgstr "编辑饮水机"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2734
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -27983,5 +28176,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2737
 msgid "Edit Fire Hydrant"
 msgstr "编辑消防栓"
@@ -27989,5 +28182,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2726 build/trans_presets.java:3124
+#: build/trans_presets.java:2739 build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underground"
@@ -27995,5 +28188,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pillar"
@@ -28001,5 +28194,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "wall"
@@ -28007,5 +28200,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pond"
@@ -28013,10 +28206,10 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2740
 msgid "Diameter"
 msgstr "直径"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "lane"
@@ -28024,5 +28217,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -28030,5 +28223,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -28036,5 +28229,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "green"
@@ -28042,41 +28235,41 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "Pressure"
 msgstr "压强"
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "xx l/min"
 msgstr "xx 升/分钟"
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "suction"
-msgstr ""
+msgstr "吸"
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2748
 msgid "Count"
-msgstr ""
+msgstr "数目"
 
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2739 build/trans_presets.java:3514
+#: build/trans_presets.java:2752 build/trans_presets.java:3527
 msgid "Sports"
 msgstr "运动"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2753
 msgid "Sport Facilities"
 msgstr "运动设施"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2754
 msgid "Stadium"
 msgstr "竞技场"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2755
 msgid "Edit Stadium"
 msgstr "编辑竞技扬"
@@ -28090,6 +28283,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2764 build/trans_presets.java:2773
+#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "select sport:"
 msgstr "选择运动："
@@ -28435,6 +28628,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -28472,6 +28665,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "multi"
 msgstr "多种"
@@ -28481,6 +28674,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "archery"
 msgstr "射箭"
@@ -28490,6 +28683,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "athletics"
 msgstr "田径"
@@ -28499,6 +28692,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "american_football"
 msgstr "橄榄球"
@@ -28508,6 +28701,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "australian_football"
 msgstr "澳洲足球"
@@ -28517,6 +28710,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "baseball"
 msgstr "棒球"
@@ -28526,6 +28719,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "basketball"
 msgstr "篮球"
@@ -28535,6 +28728,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "boules"
 msgstr "法式滚球"
@@ -28544,6 +28737,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "bowls"
 msgstr "保龄球"
@@ -28553,6 +28746,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canadian_football"
 msgstr "加拿大足球"
@@ -28562,6 +28755,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canoe"
 msgstr "独木舟"
@@ -28571,6 +28764,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "climbing"
 msgstr "攀岩"
@@ -28580,6 +28773,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket"
 msgstr "板球"
@@ -28589,6 +28782,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket_nets"
 msgstr "板球网"
@@ -28598,6 +28791,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "croquet"
 msgstr "木球"
@@ -28607,6 +28800,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cycling"
 msgstr "自行车"
@@ -28616,6 +28809,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "dog_racing"
 msgstr "赛狗"
@@ -28625,6 +28818,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "equestrian"
 msgstr "马术"
@@ -28634,6 +28827,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gaelic_football"
 msgstr "盖尔式足球"
@@ -28643,6 +28836,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "golf"
 msgstr "高尔夫"
@@ -28652,6 +28845,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gymnastics"
 msgstr "体操"
@@ -28661,6 +28854,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "hockey"
 msgstr "曲棍球"
@@ -28670,6 +28863,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "horse_racing"
 msgstr "赛马"
@@ -28679,6 +28872,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "motor"
 msgstr "摩托车"
@@ -28688,6 +28881,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "pelota"
 msgstr "回力球"
@@ -28697,6 +28890,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "racquet"
 msgstr ""
@@ -28706,6 +28899,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_league"
 msgstr "橄榄球联赛"
@@ -28715,6 +28908,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_union"
 msgstr "橄榄球联盟"
@@ -28724,6 +28917,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "shooting"
 msgstr "射击"
@@ -28733,6 +28926,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skateboard"
 msgstr "滑板"
@@ -28742,6 +28935,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skating"
 msgstr "滑冰"
@@ -28751,6 +28944,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skiing"
 msgstr "滑雪"
@@ -28760,6 +28953,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "soccer"
 msgstr "足球"
@@ -28769,6 +28962,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "swimming"
 msgstr "游泳"
@@ -28778,6 +28971,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "table_tennis"
 msgstr "桌球"
@@ -28787,71 +28980,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "tennis"
 msgstr "网球"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2763
 msgid "Sports Centre"
 msgstr "运动中心"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2764
 msgid "Edit Sports Centre"
 msgstr "编辑运动中心"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2772
 msgid "Pitch"
 msgstr "足球场"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2773
 msgid "Edit Pitch"
 msgstr "编辑足球场"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2781
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2782
 msgid "Edit Racetrack"
 msgstr "编辑跑道"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2790
 msgid "Golf Course"
 msgstr "高尔夫路线"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2791
 msgid "Edit Golf Course"
 msgstr "编辑高尔夫路线"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2796
 msgid "Miniature Golf"
 msgstr "迷你高尔夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2797
 msgid "Edit Miniature Golf"
 msgstr "编辑迷你高尔夫"
 
 #. group "Sport"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2803
 msgid "Sport"
 msgstr "运动"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2804
 msgid "Multi"
 msgstr "多种"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2805
 msgid "Edit Multi"
 msgstr "编辑多种"
@@ -28899,25 +29092,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "type"
 msgstr "类型"
@@ -28967,26 +29160,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "pitch"
 msgstr "场地"
@@ -29036,26 +29229,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "sports_centre"
 msgstr "运动中心"
@@ -29100,215 +29293,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050
 msgid "stadium"
 msgstr "体育场"
 
-#. item "Sport/Multi" combo "type" display value
-#. item "Sport/10pin" combo "type" display value
-#. item "Sport/Athletics" combo "type" display value
-#. item "Sport/Archery" combo "type" display value
-#. item "Sport/Climbing" combo "type" display value
-#. item "Sport/Canoeing" combo "type" display value
-#. item "Sport/Cycling" combo "type" display value
-#. item "Sport/Dog Racing" combo "type" display value
-#. item "Sport/Equestrian" combo "type" display value
-#. item "Sport/Horse Racing" combo "type" display value
-#. item "Sport/Gymnastics" combo "type" display value
-#. item "Sport/Skating" combo "type" display value
-#. item "Sport/Skateboard" combo "type" display value
-#. item "Sport/Swimming" combo "type" display value
-#. item "Sport/Skiing" combo "type" display value
-#. item "Sport/Shooting" combo "type" display value
-#. item "Sport (Ball)/Soccer" combo "type" display value
-#. item "Sport (Ball)/Australian Football" combo "type" display value
-#. item "Sport (Ball)/American Football" combo "type" display value
-#. item "Sport (Ball)/Canadian Football" combo "type" display value
-#. item "Sport (Ball)/Gaelic Football" combo "type" display value
-#. item "Sport (Ball)/Rugby League" combo "type" display value
-#. item "Sport (Ball)/Rugby Union" combo "type" display value
-#. item "Sport (Ball)/Baseball" combo "type" display value
-#. item "Sport (Ball)/Basketball" combo "type" display value
-#. item "Sport (Ball)/Golf" combo "type" display value
-#. item "Sport (Ball)/Boule" combo "type" display value
-#. item "Sport (Ball)/Bowls" combo "type" display value
-#. item "Sport (Ball)/Cricket" combo "type" display value
-#. item "Sport (Ball)/Cricket Nets" combo "type" display value
-#. item "Sport (Ball)/Croquet" combo "type" display value
-#. item "Sport (Ball)/Hockey" combo "type" display value
-#. item "Sport (Ball)/Pelota" combo "type" display value
-#. item "Sport (Ball)/Racquet" combo "type" display value
-#. item "Sport (Ball)/Table Tennis" combo "type" display value
-#. item "Sport (Ball)/Tennis" combo "type" display value
-#. item "Motorsport/Motorsport" combo "type" display value
-#. item "Motorsport/Karting" combo "type" display value
-#. item "Motorsport/Motocross" combo "type" display value
-#. item "Motorsport/Safety Training" combo "type" display value
-#. item "Motorsport/Model Aerodrome" combo "type" display value
-#. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-msgid "track"
-msgstr "轨迹"
-
 #. item "Sport/10pin"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2810
 msgid "10pin"
 msgstr "保龄球"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2811
 msgid "Edit 10pin"
 msgstr "编辑保龄球"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2816
 msgid "Athletics"
 msgstr "田径"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2817
 msgid "Edit Athletics"
 msgstr "编辑田径"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2822
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2823
 msgid "Edit Archery"
 msgstr "编辑射箭"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2828
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2829
 msgid "Edit Climbing"
 msgstr "编辑攀岩"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2834
 msgid "Canoeing"
 msgstr "独木舟"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2835
 msgid "Edit Canoeing"
 msgstr "编辑独木舟"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2841
 msgid "Edit Cycling"
 msgstr "编辑自行车"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2846
 msgid "Dog Racing"
 msgstr "赛狗"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2847
 msgid "Edit Dog Racing"
 msgstr "编辑赛狗"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2852
 msgid "Equestrian"
 msgstr "马术"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2853
 msgid "Edit Equestrian"
 msgstr "编辑马术"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2858
 msgid "Horse Racing"
 msgstr "赛马"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2859
 msgid "Edit Horse Racing"
 msgstr "编辑赛马"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2864
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2865
 msgid "Edit Gymnastics"
 msgstr "编辑体操"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2870
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2871
 msgid "Edit Skating"
 msgstr "编辑溜冰"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2876
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2877
 msgid "Edit Skateboard"
 msgstr "编辑滑板"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2882
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2883
 msgid "Edit Swimming"
 msgstr "编辑游泳"
@@ -29316,60 +29443,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2890
 msgid "Edit Skiing"
 msgstr "编辑滑雪"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "Piste type"
 msgstr "滑雪方式"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "downhill"
 msgstr "高山"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "nordic"
 msgstr "北欧"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "snow_park"
 msgstr "公园"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "Difficulty"
 msgstr "困难度"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "novice"
 msgstr "新手"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "easy"
 msgstr "容易"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "advanced"
 msgstr "高级"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "expert"
 msgstr "专家"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "freeride"
 msgstr "自由滑"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2897
 msgid "Shooting"
 msgstr "射击"
@@ -29377,105 +29504,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2899
 msgid "Edit Shooting"
 msgstr "编辑射击"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2905
 msgid "Sport (Ball)"
 msgstr "运动(球类)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2906
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2907
 msgid "Edit Soccer"
 msgstr "编辑足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2912
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2913
 msgid "Edit Australian Football"
 msgstr "编辑澳洲足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2918
 msgid "American Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2919
 msgid "Edit American Football"
 msgstr "编辑美式足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2924
 msgid "Canadian Football"
 msgstr "加拿大式足球"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2925
 msgid "Edit Canadian Football"
 msgstr "编辑加拿大式足球"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2930
 msgid "Gaelic Football"
 msgstr "盖尔式足球"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2931
 msgid "Edit Gaelic Football"
 msgstr "编辑盖尔式足球"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2936
 msgid "Rugby League"
 msgstr "联盟式橄榄球"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2937
 msgid "Edit Rugby League"
 msgstr "编辑联盟式橄榄球"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2942
 msgid "Rugby Union"
 msgstr "联合式橄榄球"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2943
 msgid "Edit Rugby Union"
 msgstr "编辑联合式橄榄球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2948
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2949
 msgid "Edit Baseball"
 msgstr "编辑棒球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2954
 msgid "Basketball"
 msgstr "篮球"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2955
 msgid "Edit Basketball"
 msgstr "编辑篮球"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2960
 msgid "Volleyball"
 msgstr "排球"
@@ -29483,10 +29610,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2962
 msgid "Edit Volleyball"
 msgstr "编辑排球"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2969
 msgid "Beachvolleyball"
 msgstr "沙滩排球"
@@ -29494,120 +29621,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2971
 msgid "Edit Beachvolleyball"
 msgstr "编辑沙滩排球"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2978
 msgid "Golf"
 msgstr "高尔夫"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2979
 msgid "Edit Golf"
 msgstr "编辑高尔夫"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2982
 msgid "golf_course"
 msgstr "高尔夫路线"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2984
 msgid "Boule"
 msgstr "草地滚球"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2985
 msgid "Edit Boule"
 msgstr "编辑草地滚球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2990
 msgid "Bowls"
 msgstr "保龄球"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2991
 msgid "Edit Bowls"
 msgstr "编辑保龄球"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2996
 msgid "Cricket"
 msgstr "板球"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2997
 msgid "Edit Cricket"
 msgstr "编辑板球"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3002
 msgid "Cricket Nets"
 msgstr "板球网"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3003
 msgid "Edit Cricket Nets"
 msgstr "编辑板球网"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3008
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3009
 msgid "Edit Croquet"
 msgstr "编辑木球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3014
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3015
 msgid "Edit Hockey"
 msgstr "编辑曲棍球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3020
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3021
 msgid "Edit Pelota"
 msgstr "编辑回力球"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3026
 msgid "Racquet"
 msgstr "墙网球"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3027
 msgid "Edit Racquet"
 msgstr "编辑墙网球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3032
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3033
 msgid "Edit Table Tennis"
 msgstr "编辑桌球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3038
 msgid "Tennis"
 msgstr "网球"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3039
 msgid "Edit Tennis"
 msgstr "编辑网球"
@@ -29615,40 +29742,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:3032 build/trans_presets.java:3033
+#: build/trans_presets.java:3045 build/trans_presets.java:3046
 msgid "Motorsport"
 msgstr "赛车"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3047
 msgid "Edit Motorsport"
 msgstr "编辑赛车"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3052
 msgid "Karting"
 msgstr "卡丁车"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3053
 msgid "Edit Karting"
 msgstr "编辑卡丁车"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3058
 msgid "Motocross"
 msgstr "摩托车越野赛"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3059
 msgid "Edit Motocross"
 msgstr "编辑摩托车越野赛"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3064
 msgid "Safety Training"
 msgstr "安全培训"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3065
 msgid "Edit Safety Training"
 msgstr "编辑安全培训"
@@ -29656,20 +29783,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3071
 msgid "Model Aerodrome"
 msgstr "模型飞机机场"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3072
 msgid "Edit Model Aerodrome"
 msgstr "编辑模型飞机机场"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3077
 msgid "RC Car"
 msgstr "遥控车"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3078
 msgid "Edit RC Car"
 msgstr "编辑遥控车"
@@ -29677,10 +29804,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:3072 build/trans_presets.java:3073
+#: build/trans_presets.java:3085 build/trans_presets.java:3086
 msgid "Man Made"
 msgstr "人造物"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3087
 msgid "Building"
 msgstr "建筑物"
@@ -29688,25 +29815,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3090
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3091
 msgid "Edit Tower"
 msgstr "编辑塔"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "Tower type"
 msgstr "塔类型"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "communication"
 msgstr "通讯"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "observation"
 msgstr "观测"
@@ -29715,5 +29842,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:3083 build/trans_presets.java:3104
+#: build/trans_presets.java:3096 build/trans_presets.java:3117
 msgid "Height (meters)"
 msgstr "高度(米)"
@@ -29721,5 +29848,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3100
 msgid "Flagpole"
 msgstr "旗杆"
@@ -29729,15 +29856,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3105
 msgid "Works"
 msgstr "工厂"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3106
 msgid "Edit Works"
 msgstr "编辑工厂"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3110
 msgid "Chimney"
 msgstr "烟囱"
@@ -29745,10 +29872,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3112
 msgid "Edit Chimney"
 msgstr "编辑烟囱"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3119
 msgid "Windmill"
 msgstr "风车"
@@ -29756,20 +29883,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3121
 msgid "Edit Windmill"
 msgstr "编辑风车"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3125
 msgid "Gasometer"
 msgstr "贮气桶"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3126
 msgid "Edit Gasometer"
 msgstr "编辑贮气桶"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3130
 msgid "Pipeline"
 msgstr "管道"
@@ -29778,5 +29905,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3133
 msgid "Edit Pipeline"
 msgstr "编辑管道"
@@ -29820,5 +29947,5 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:3123 build/trans_style.java:817
+#: build/trans_presets.java:3136 build/trans_style.java:817
 #: build/trans_style.java:830 build/trans_style.java:842
 #: build/trans_style.java:847 build/trans_style.java:2936
@@ -29831,10 +29958,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "gas"
 msgstr "天然气"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "heat"
 msgstr "热力"
@@ -29842,20 +29969,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "oil"
 msgstr "石油"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "sewage"
 msgstr "污水"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgid "Location"
 msgstr "位置"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underwater"
@@ -29863,5 +29990,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "overground"
@@ -29869,5 +29996,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3139
 msgid "Crane"
 msgstr "起重机"
@@ -29875,10 +30002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3141
 msgid "Edit Crane"
 msgstr "编辑起重机"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3145
 msgid "Mineshaft"
 msgstr "竖井"
@@ -29887,25 +30014,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3148
 msgid "Edit Mineshaft"
 msgstr "编辑竖井"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "Function"
 msgstr "功能"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "winding"
 msgstr "通风"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "air"
 msgstr "空气"
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3152
 msgid "Depth in meters"
 msgstr "深度(米)"
@@ -29913,5 +30040,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "Resource"
 msgstr "资源"
@@ -29919,5 +30046,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "aggregate"
 msgstr "多种"
@@ -29925,5 +30052,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "bauxite"
 msgstr "矾土"
@@ -29932,6 +30059,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3263
 msgid "coal"
 msgstr "煤炭"
@@ -29939,5 +30066,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "copper"
 msgstr "铜"
@@ -29945,5 +30072,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "dimension_stone"
 msgstr "石材"
@@ -29951,5 +30078,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "gold"
 msgstr "金"
@@ -29957,5 +30084,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "ilmenite"
 msgstr "钛铁"
@@ -29963,5 +30090,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "iron_ore"
 msgstr "铁"
@@ -29969,5 +30096,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "lead"
 msgstr "铅"
@@ -29975,5 +30102,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "limestone"
 msgstr "石灰石"
@@ -29981,5 +30108,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "nickel"
 msgstr "镍"
@@ -29987,5 +30114,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "rutile"
 msgstr "金红石"
@@ -29993,5 +30120,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "salt"
 msgstr "石盐"
@@ -29999,5 +30126,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "silver"
 msgstr "银"
@@ -30005,5 +30132,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "tin"
 msgstr "锡"
@@ -30011,5 +30138,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zinc"
 msgstr "锌"
@@ -30017,10 +30144,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zircon"
 msgstr "锆石"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3155
 msgid "Visible Headframe"
 msgstr "可见井架"
@@ -30028,10 +30155,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:3143 build/trans_presets.java:3153
+#: build/trans_presets.java:3156 build/trans_presets.java:3166
 msgid "Disused"
 msgstr "废弃"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3158
 msgid "Adit"
 msgstr "坑道"
@@ -30039,10 +30166,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3160
 msgid "Edit Adit"
 msgstr "编辑坑道"
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3163
 msgid "Length in meters"
 msgstr "长度(米)"
@@ -30050,15 +30177,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3169
 msgid "Water Tower"
 msgstr "贮水塔"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3170
 msgid "Edit Water Tower"
 msgstr "编辑贮水塔"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3174
 msgid "Water Works"
 msgstr "给水厂"
@@ -30066,10 +30193,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3176
 msgid "Edit Water Works"
 msgstr "编辑给水厂"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3182
 msgid "Wastewater Plant"
 msgstr "污水处理厂"
@@ -30079,10 +30206,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3186
 msgid "Edit Wastewater Plant"
 msgstr "编辑污水处理厂"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3190
 msgid "Watermill"
 msgstr "使用水车的磨坊"
@@ -30090,10 +30217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:3192
 msgid "Edit Watermill"
 msgstr "编辑水磨"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3197
 msgid "Fountain"
 msgstr "喷泉"
@@ -30102,10 +30229,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3200
 msgid "Edit Fountain"
 msgstr "编辑喷泉"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3204
 msgid "Water Well"
 msgstr "水井"
@@ -30113,5 +30240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3206
 msgid "Edit Water Well"
 msgstr "编辑水井"
@@ -30119,5 +30246,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3211
 msgid "Lighthouse"
 msgstr "灯塔"
@@ -30125,5 +30252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3213
 msgid "Edit Lighthouse"
 msgstr "编辑灯塔"
@@ -30131,10 +30258,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3219
 msgid "Edit Beacon"
 msgstr "编辑灯标"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3223
 msgid "Street Lamp"
 msgstr "路灯"
@@ -30142,5 +30269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3225
 msgid "Edit Street Lamp"
 msgstr "编辑路灯"
@@ -30149,15 +30276,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Operation times"
 msgstr "工作时间"
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Mo-Fr 22:00-05:00"
 msgstr "周一-周五 22：00-05：00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3230
 msgid "Measurement Station"
 msgstr "测量站"
@@ -30165,62 +30292,61 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3232
 msgid "Edit Measurement Station"
 msgstr "编辑测量站"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "Measurement"
 msgstr "测量"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "particulate_matter"
 msgstr "颗粒物"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "seismic"
 msgstr "地震"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "water_level"
 msgstr "水位"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "weather"
 msgstr "天气"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "Recording"
 msgstr "记录"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "manually"
 msgstr "手动"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "automated"
 msgstr "自动"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "remote"
 msgstr "远程"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:3239
 msgctxt "display"
 msgid "no"
-msgstr "否"
+msgstr "无"
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3241
 msgid "Survey Point"
 msgstr "测量点"
@@ -30228,10 +30354,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3243
 msgid "Edit Survey Point"
 msgstr "编辑测量点"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3247
 msgid "Surveillance"
 msgstr "监控"
@@ -30239,30 +30365,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3249
 msgid "Edit Surveillance Camera"
 msgstr "编辑监控摄影机"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "indoor"
 msgstr "室内"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "outdoor"
 msgstr "室外"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "public"
 msgstr "公共"
 
 #. group "Power"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3255
 msgid "Power"
 msgstr "电力"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3256
 msgid "Power Generator"
 msgstr "发电厂"
@@ -30272,148 +30398,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3260
 msgid "Edit Power Generator"
 msgstr "编辑发电厂"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biofuel"
 msgstr "生物燃料"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biogas"
 msgstr "沼气"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biomass"
 msgstr "生物质"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "diesel"
 msgstr "柴油"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "gasoline"
-msgstr "在线"
+msgstr "汽油"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "geothermal"
 msgstr "地热"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "hydro"
 msgstr "水"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "nuclear"
 msgstr "核"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "osmotic"
-msgstr "提示"
+msgstr "渗透压"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "solar"
 msgstr "太阳"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "tidal"
-msgstr "滩涂"
+msgstr "潮汐"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "waste"
-msgstr "废弃物"
+msgstr "垃圾"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wave"
-msgstr ""
+msgstr "波浪"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wind"
 msgstr "风"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "Method"
 msgstr "方式"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "anaerobic_digestion"
 msgstr "无氧消化"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "combustion"
 msgstr "燃烧"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "dam"
 msgstr "水坝"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "fission"
 msgstr "裂变"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "fusion"
-msgstr "裂变"
+msgstr "聚变"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "gasification"
 msgstr "气化"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "photovoltaic"
 msgstr "光伏"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumped-storage"
-msgstr "安培数"
+msgstr "抽水蓄能"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumping"
-msgstr "露营"
+msgstr "泵"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pyrolysis"
-msgstr ""
+msgstr "裂解"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "run-of-the-river"
-msgstr ""
+msgstr "水流"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "thermal"
 msgstr "热"
@@ -30421,11 +30539,10 @@
 #. <space />
 #. item "Power/Power Generator" label "Output forms of energy"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3266
 msgid "Output forms of energy"
-msgstr ""
+msgstr "能量输出形式"
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3254
-#, fuzzy
+#: build/trans_presets.java:3267
 msgid "electricity"
 msgstr "电"
@@ -30440,11 +30557,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "2 W"
-msgstr ""
+msgstr "2 瓦"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30457,11 +30574,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "3 kW"
-msgstr ""
+msgstr "3 千瓦"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30474,11 +30591,11 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "5 MW"
-msgstr ""
+msgstr "5 兆瓦"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30491,56 +30608,54 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "7 GW"
-msgstr ""
+msgstr "7 吉瓦"
 
 #. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3255
-#, fuzzy
+#: build/trans_presets.java:3268
 msgid "hot water"
-msgstr "水域"
+msgstr "热水"
 
 #. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3269
 msgid "hot air"
-msgstr ""
+msgstr "热气"
 
 #. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3257
-#, fuzzy
+#: build/trans_presets.java:3270
 msgid "cold water"
-msgstr "水域"
+msgstr "冷水"
 
 #. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3271
 msgid "cold air"
-msgstr ""
+msgstr "冷气"
 
 #. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3272
 msgid "compressed air"
-msgstr ""
+msgstr "压缩空气"
 
 #. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3273
 msgid "steam"
-msgstr ""
+msgstr "蒸汽"
 
 #. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3274
 msgid "vacuum"
-msgstr ""
+msgstr "真空"
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3275
 msgid "battery charging"
-msgstr ""
+msgstr "电池充电"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3277
 msgid "Power Station"
 msgstr "配电站"
@@ -30549,10 +30664,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3280
 msgid "Edit Power Station"
 msgstr "编辑配电站"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3286
 msgid "Power Sub Station"
 msgstr "配电分站"
@@ -30561,5 +30676,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3289
 msgid "Edit Power Sub Station"
 msgstr "编辑配电分站"
@@ -30567,10 +30682,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3279 build/trans_presets.java:3312
+#: build/trans_presets.java:3292 build/trans_presets.java:3325
 msgid "Line reference"
 msgstr "电线编号"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3294
 msgid "Cable Distribution Cabinet"
 msgstr "电缆配电柜"
@@ -30579,5 +30694,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3297
 msgid "Edit Cable Distribution Cabinet"
 msgstr "编辑电缆配电柜"
@@ -30585,5 +30700,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3303
 msgid "Power Tower"
 msgstr "电塔"
@@ -30594,5 +30709,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3295
+#: build/trans_presets.java:3308
 msgid "Edit Power Tower"
 msgstr "编辑电塔"
@@ -30600,10 +30715,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3310
 msgid "Tower reference"
 msgstr "塔编号"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3312
 msgid "Pole"
 msgstr "电竿"
@@ -30612,5 +30727,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:3315
 msgid "Edit Power Pole"
 msgstr "编辑电竿"
@@ -30618,10 +30733,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:3317
 msgid "Pole reference"
 msgstr "竿编号"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3319
 msgid "Power Line"
 msgstr "电线"
@@ -30630,15 +30745,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3322
 msgid "Edit Power Line"
 msgstr "编辑电线"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgid "Line type"
 msgstr "电线类型"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "line"
@@ -30646,5 +30761,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "minor_line"
@@ -30652,40 +30767,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3328
 msgid "Amount of Cables"
 msgstr "电缆数"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "每根电缆的电线(更好：导体)数"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "single"
 msgstr "单根"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "double"
 msgstr "双根"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "triple"
 msgstr "三根"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "quad"
 msgstr "四根"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3332
 msgid "Historic Places"
 msgstr "历史地区"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3320
+#: build/trans_presets.java:3333
 msgid "Castle"
 msgstr "城堡"
@@ -30694,20 +30809,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3336
 msgid "Edit Castle"
 msgstr "编辑城堡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3341
 msgid "Ruins"
 msgstr "遗迹"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3342
 msgid "Edit Ruins"
 msgstr "编辑遗迹"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3347
 msgid "Archaeological Site"
 msgstr "考古学地区"
@@ -30716,10 +30831,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3337
+#: build/trans_presets.java:3350
 msgid "Edit Archaeological Site"
 msgstr "编辑考古学地区"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3355
 msgid "Battlefield"
 msgstr "战场"
@@ -30727,10 +30842,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3344
+#: build/trans_presets.java:3357
 msgid "Edit Battlefield"
 msgstr "编辑战场"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3361
 msgid "Palaeontological Site"
 msgstr "古生物现场"
@@ -30738,5 +30853,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3363
 msgid "Edit Palaeontological Site"
 msgstr "编辑古生物现场"
@@ -30744,15 +30859,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3368
 msgid "Monument"
 msgstr "纪念建筑"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3369
 msgid "Edit Monument"
 msgstr "编辑纪念建筑"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3373
 msgid "Memorial"
 msgstr "纪念碑"
@@ -30760,60 +30875,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3375
 msgid "Edit Memorial"
 msgstr "编辑纪念碑"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3379
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3380
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3371
+#: build/trans_presets.java:3384
 msgid "Wayside Shrine"
-msgstr ""
+msgstr "圣像柱"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3385
 msgid "Edit Wayside Shrine"
-msgstr ""
+msgstr "编辑圣像柱"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3376
+#: build/trans_presets.java:3389
 msgid "Boundary Stone"
 msgstr "界碑"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3377
+#: build/trans_presets.java:3390
 msgid "Edit Boundary Stone"
 msgstr "编辑界碑"
 
 #. group "Shops"
-#: build/trans_presets.java:3383
+#: build/trans_presets.java:3396
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3397
 msgid "Food"
 msgstr "食品"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3398
 msgid "Supermarket"
 msgstr "超市"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3399
 msgid "Edit Supermarket"
 msgstr "编辑超市"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3391
+#: build/trans_presets.java:3404
 msgid "Convenience Store"
 msgstr "便利店"
@@ -30821,10 +30936,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3406
 msgid "Edit Convenience Store"
 msgstr "编辑便利店"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3411
 msgid "Kiosk"
 msgstr "售货亭"
@@ -30832,5 +30947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3400
+#: build/trans_presets.java:3413
 msgid "Edit Kiosk"
 msgstr "编辑售货亭"
@@ -30838,5 +30953,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3419
 msgid "Baker"
 msgstr "面包店"
@@ -30844,10 +30959,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3421
 msgid "Edit Baker"
 msgstr "编辑面包店"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3426
 msgid "Butcher"
 msgstr "肉类"
@@ -30855,10 +30970,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3415
+#: build/trans_presets.java:3428
 msgid "Edit Butcher"
 msgstr "编辑肉店"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:3433
 msgid "Seafood"
 msgstr "海鲜"
@@ -30866,10 +30981,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3435
 msgid "Edit Seafood"
 msgstr "编辑海鲜"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3442
 msgid "Deli (Fine Food)"
 msgstr "熟食店(美食)"
@@ -30877,10 +30992,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3444
 msgid "Edit Deli (Fine Food)"
 msgstr "编辑熟食店(美食)"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3451
 msgid "Confectionery"
 msgstr "糖果"
@@ -30888,5 +31003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3453
 msgid "Edit Confectionery"
 msgstr "编辑糖果"
@@ -30894,5 +31009,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3459
 msgid "Marketplace"
 msgstr "市场"
@@ -30900,10 +31015,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3461
 msgid "Edit Marketplace"
 msgstr "编辑市场"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3468
 msgid "Greengrocer"
 msgstr "蔬果店"
@@ -30911,15 +31026,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:3470
 msgid "Edit Greengrocer"
 msgstr "编辑蔬果店"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3477
 msgid "Organic"
 msgstr "有机产品"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3465
+#: build/trans_presets.java:3478
 msgid "Edit Organic Shop"
 msgstr "编辑有机产品商店"
@@ -30927,5 +31042,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3471
+#: build/trans_presets.java:3484
 msgid "Alcohol"
 msgstr "酒"
@@ -30933,25 +31048,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3486
 msgid "Edit Alcohol Shop"
 msgstr "编辑酒水店"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3491
 msgid "Beverages"
 msgstr "饮料"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3492
 msgid "Edit Beverages Shop"
 msgstr "编辑饮料店"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3487
+#: build/trans_presets.java:3500
 msgid "Edit Clothes Shop"
 msgstr "服装店"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3505
 msgid "Boutique"
 msgstr "时装"
@@ -30959,20 +31074,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3494
+#: build/trans_presets.java:3507
 msgid "Edit Boutique"
 msgstr "编辑时装店"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3514
 msgid "Shoes"
 msgstr "鞋"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:3515
 msgid "Edit Shoe Shop"
 msgstr "编辑鞋店"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3520
 msgid "Outdoor"
 msgstr "户外用品"
@@ -30980,10 +31095,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3522
 msgid "Edit Outdoor Shop"
 msgstr "编辑户外用品店"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3528
 msgid "Edit Sports Shop"
 msgstr "编辑运动用品店"
@@ -30991,5 +31106,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3534
 msgid "Dry Cleaning"
 msgstr "干洗店"
@@ -30997,10 +31112,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3536
 msgid "Edit Dry Cleaning"
 msgstr "编辑干洗店"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3541
 msgid "Laundry"
 msgstr "洗衣店"
@@ -31008,20 +31123,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3530
+#: build/trans_presets.java:3543
 msgid "Edit Laundry"
 msgstr "编辑洗衣店"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3548
 msgid "Tailor"
 msgstr "制衣店"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3549
 msgid "Edit Tailor"
 msgstr "编辑制衣店"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3554
 msgid "Fabric"
 msgstr "布"
@@ -31029,35 +31144,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3556
 msgid "Edit Fabric"
 msgstr "编辑布店"
 
 #. group "Electronic"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3564
 msgid "Electronic"
 msgstr "电器"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:3565
 msgid "Computer"
 msgstr "电脑"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3566
 msgid "Edit Computer Shop"
 msgstr "编辑电脑商店"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:3571
 msgid "Electronics"
 msgstr "电子材料"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3572
 msgid "Edit Electronics Shop"
 msgstr "编辑电子材料行"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3577
 msgid "Mobile Phone"
 msgstr "手机"
@@ -31065,10 +31180,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3579
 msgid "Edit Mobile Phone"
 msgstr "编辑手机"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3586
 msgid "Vacuum Cleaner"
 msgstr "吸尘器"
@@ -31076,35 +31191,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3575
+#: build/trans_presets.java:3588
 msgid "Edit Vacuum Cleaner"
 msgstr "编辑吸尘器"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:3595
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3596
 msgid "Edit Hifi Shop"
 msgstr "编辑 Hifi 音响店"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3601
 msgid "Video"
 msgstr "影片"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3602
 msgid "Edit Video Shop"
 msgstr "编辑影片类商店"
 
 #. group "Cash"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3608
 msgid "Cash"
 msgstr "现金"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3609
 msgid "Bank"
 msgstr "银行"
@@ -31112,5 +31227,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3611
 msgid "Edit Bank"
 msgstr "编辑银行"
@@ -31118,10 +31233,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3603 build/trans_presets.java:3612
+#: build/trans_presets.java:3616 build/trans_presets.java:3625
 msgid "Automated Teller Machine"
 msgstr "自动取款机(ATM)"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3605
+#: build/trans_presets.java:3618
 msgid "Money Exchange"
 msgstr "货币兑换所"
@@ -31129,5 +31244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:3620
 msgid "Edit Money Exchange"
 msgstr "编辑货币兑换所"
@@ -31135,10 +31250,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:3627
 msgid "Edit Automated Teller Machine"
 msgstr "编辑自动柜员机"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:3633
 msgid "Department Store"
 msgstr "百货商店"
@@ -31146,10 +31261,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3622
+#: build/trans_presets.java:3635
 msgid "Edit Department Store"
 msgstr "编辑百货商店"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3629
+#: build/trans_presets.java:3642
 msgid "Mall"
 msgstr "购物中心"
@@ -31157,5 +31272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3644
 msgid "Edit Mall"
 msgstr "编辑购物中心"
@@ -31163,35 +31278,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3639
+#: build/trans_presets.java:3652
 msgid "Chemist"
 msgstr "化妆品店"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3653
 msgid "Edit Chemist"
 msgstr "编辑化妆品店"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3645
+#: build/trans_presets.java:3658
 msgid "Hairdresser"
 msgstr "美发店"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3659
 msgid "Edit Hairdresser"
 msgstr "编辑美发店"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3664
 msgid "Optician"
 msgstr "眼镜店"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3665
 msgid "Edit Optician"
 msgstr "编辑眼镜店"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:3670
 msgid "Jewelry"
 msgstr "首饰"
@@ -31199,10 +31314,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3672
 msgid "Edit Jewelry"
 msgstr "编辑首饰"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3679
 msgid "Erotic"
 msgstr "情色"
@@ -31210,5 +31325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3681
 msgid "Edit Erotic"
 msgstr "编辑情色"
@@ -31216,5 +31331,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3689
 msgid "Florist"
 msgstr "花类"
@@ -31222,10 +31337,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3678
+#: build/trans_presets.java:3691
 msgid "Edit Florist"
 msgstr "编辑花店"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3696
 msgid "Garden Centre"
 msgstr "园艺中心"
@@ -31233,5 +31348,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3698
 msgid "Edit Garden Centre"
 msgstr "编辑园艺中心"
@@ -31239,5 +31354,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:3704
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -31245,10 +31360,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:3706
 msgid "Edit Do-it-yourself-store"
 msgstr "编辑 DIY 商店"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3711
 msgid "Hardware"
 msgstr "硬件"
@@ -31256,10 +31371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:3713
 msgid "Edit Hardware Store"
 msgstr "编辑硬件商店"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:3718
 msgid "Paint"
 msgstr "油漆"
@@ -31267,5 +31382,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3707
+#: build/trans_presets.java:3720
 msgid "Edit Paint"
 msgstr "编辑油漆"
@@ -31273,15 +31388,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3715
+#: build/trans_presets.java:3728
 msgid "Furniture"
 msgstr "家俱"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3716
+#: build/trans_presets.java:3729
 msgid "Edit Furniture Shop"
 msgstr "编辑家俱店"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3721
+#: build/trans_presets.java:3734
 msgid "Kitchen"
 msgstr "炊具"
@@ -31289,10 +31404,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3723
+#: build/trans_presets.java:3736
 msgid "Edit Kitchen"
 msgstr "编辑炊具"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3730
+#: build/trans_presets.java:3743
 msgid "Curtain"
 msgstr "窗帘"
@@ -31300,10 +31415,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3745
 msgid "Edit Curtain"
 msgstr "编辑窗帘"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3752
 msgid "Frame"
 msgstr "框架"
@@ -31311,5 +31426,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3754
 msgid "Edit Frames"
 msgstr "编辑框架"
@@ -31317,15 +31432,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3762
 msgid "Stationery"
 msgstr "文具"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:3763
 msgid "Edit Stationery Shop"
 msgstr "编辑文具店"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3768
 msgid "Copyshop"
 msgstr "复印店"
@@ -31333,15 +31448,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3757
+#: build/trans_presets.java:3770
 msgid "Edit Copyshop"
 msgstr "编辑复印店"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3764
+#: build/trans_presets.java:3777
 msgid "Book Store"
 msgstr "书店"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3765
+#: build/trans_presets.java:3778
 msgid "Edit Book Store"
 msgstr "编辑书店"
@@ -31349,15 +31464,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3771
+#: build/trans_presets.java:3784
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3785
 msgid "Edit Travel Agency"
 msgstr "编辑旅行社"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3790
 msgid "Musical Instrument"
 msgstr "乐器"
@@ -31365,20 +31480,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3779
+#: build/trans_presets.java:3792
 msgid "Edit Musical Instruments"
 msgstr "编辑乐器"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3786
+#: build/trans_presets.java:3799
 msgid "Toys"
 msgstr "玩具"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3787
+#: build/trans_presets.java:3800
 msgid "Edit Toy Shop"
 msgstr "编辑玩具店"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:3805
 msgid "Variety Store"
 msgstr "杂货店"
@@ -31386,10 +31501,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:3807
 msgid "Edit Variety Store"
 msgstr "编辑杂货店"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3802
+#: build/trans_presets.java:3815
 msgid "Vending machine"
 msgstr "自动贩卖机"
@@ -31397,5 +31512,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3817
 msgid "Edit Vending machine"
 msgstr "编辑自动贩卖机"
@@ -31403,180 +31518,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "Vending products"
 msgstr "贩卖产品"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_tickets"
 msgstr "公共交通车票"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_plans"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "parking_tickets"
 msgstr "停车票"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "food"
 msgstr "食物"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "drinks"
 msgstr "饮料"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "sweets"
 msgstr "甜点"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "cigarettes"
 msgstr "菸"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "photos"
 msgstr "相片"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "animal_food"
 msgstr "饲料"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "news_papers"
 msgstr "报纸"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "toys"
 msgstr "玩具"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "stamps"
 msgstr "邮票"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "SIM-cards"
 msgstr "SIM卡"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "telephone_vouchers"
 msgstr "电话券"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "vouchers"
 msgstr "券"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "bicycle_tube"
 msgstr "自行车内胎"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "condoms"
 msgstr "保险套"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "tampons"
 msgstr "棉球"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "excrement_bags"
 msgstr "粪袋"
 
 #. group "Geography"
-#: build/trans_presets.java:3818 build/trans_presets.java:3942
+#: build/trans_presets.java:3831 build/trans_presets.java:3955
 msgid "Geography"
 msgstr "地理"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3832
 msgid "Boundaries"
 msgstr "边界"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3833
 msgid "National"
 msgstr "国家"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3821
+#: build/trans_presets.java:3834
 msgid "Edit National Boundary"
 msgstr "编辑国界"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:3839
 msgid "Administrative"
 msgstr "行政区"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:3840
 msgid "Edit Administrative Boundary"
 msgstr "编辑行政区边界"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3845
 msgid "Civil"
 msgstr "城市"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3846
 msgid "Edit Civil Boundary"
 msgstr "编辑城市边界"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:3851
 msgid "Political"
 msgstr "政治"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3852
 msgid "Edit Political Boundary"
 msgstr "编辑政治边界"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:3857
 msgid "National park"
 msgstr "国家公园"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3858
 msgid "Edit National Park Boundary"
 msgstr "编辑国家公园"
 
 #. group "Places"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3864
 msgid "Places"
 msgstr "地名"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3865
 msgid "Continent"
 msgstr "大洲"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3853
+#: build/trans_presets.java:3866
 msgid "Edit Continent"
 msgstr "编辑大洲"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:3872
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31584,10 +31699,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3860
+#: build/trans_presets.java:3873
 msgid "Edit Country"
 msgstr "编辑国家"
 
 #. item "Places/State"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3879
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31595,25 +31710,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3867
+#: build/trans_presets.java:3880
 msgid "Edit State"
 msgstr "编辑省/州"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3886
 msgid "Region"
 msgstr "地区"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3887
 msgid "Edit Region"
 msgstr "编辑地区"
 
 #. item "Places/County"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3893
 msgid "County"
 msgstr "县"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:3894
 msgid "Edit County"
 msgstr "编辑县"
@@ -31621,5 +31736,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3888
+#: build/trans_presets.java:3901
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -31628,10 +31743,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:3902
 msgid "Edit City"
 msgstr "编辑市"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:3908
 msgid "Town"
 msgstr "镇"
@@ -31639,10 +31754,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3897
+#: build/trans_presets.java:3910
 msgid "Edit Town"
 msgstr "编辑镇"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:3916
 msgid "Suburb"
 msgstr "郊区"
@@ -31650,42 +31765,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3905
+#: build/trans_presets.java:3918
 msgid "Edit Suburb"
 msgstr "编辑郊区"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3911
+#: build/trans_presets.java:3924
 msgid "Village"
 msgstr "行政村"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3912
+#: build/trans_presets.java:3925
 msgid "Edit Village"
 msgstr "编辑村"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3931
 msgid "Hamlet"
 msgstr "自然村"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3919
+#: build/trans_presets.java:3932
 msgid "Edit Hamlet"
 msgstr "编辑自然村"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3938
 msgid "Isolated Dwelling"
 msgstr ""
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3926
-#, fuzzy
+#: build/trans_presets.java:3939
 msgid "Edit Isolated Dwelling"
-msgstr "编辑水井"
+msgstr ""
 
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:3946
 msgid "Locality"
 msgstr "地区"
@@ -31693,10 +31807,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3935
+#: build/trans_presets.java:3948
 msgid "Edit Locality"
 msgstr "编辑地区"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:3956
 msgid "Peak"
 msgstr "山峰"
@@ -31704,10 +31818,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3945
+#: build/trans_presets.java:3958
 msgid "Edit Peak"
 msgstr "编辑山峰"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:3964
 msgid "Glacier"
 msgstr "冰河"
@@ -31715,10 +31829,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:3966
 msgid "Edit Glacier"
 msgstr "编辑冰河"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:3972
 msgid "Volcano"
 msgstr "火山"
@@ -31726,10 +31840,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3961
+#: build/trans_presets.java:3974
 msgid "Edit Volcano"
 msgstr "编辑火山"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3967
+#: build/trans_presets.java:3980
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -31737,5 +31851,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3969
+#: build/trans_presets.java:3982
 msgid "Edit Cave Entrance"
 msgstr "编辑洞窟入口"
@@ -31743,5 +31857,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3975
+#: build/trans_presets.java:3988
 msgid "Island"
 msgstr "岛"
@@ -31749,10 +31863,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:3990
 msgid "Edit Island"
 msgstr "编辑岛"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:3996
 msgid "Islet"
 msgstr "屿"
@@ -31760,15 +31874,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:3998
 msgid "Edit Islet"
 msgstr "编辑屿"
 
 #. group "Nature"
-#: build/trans_presets.java:3992
+#: build/trans_presets.java:4005
 msgid "Nature"
 msgstr "自然"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3993
+#: build/trans_presets.java:4006
 msgid "Tree"
 msgstr "树"
@@ -31777,15 +31891,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:4009
 msgid "Edit Tree"
 msgstr "编辑树"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4014
 msgid "Botanical Name"
 msgstr "植物学名"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4003
+#: build/trans_presets.java:4016
 msgid "Wood"
 msgstr "树林"
@@ -31794,10 +31908,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4019
 msgid "Edit Wood"
 msgstr "编辑树林"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "coniferous"
@@ -31805,5 +31919,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "deciduous"
@@ -31811,5 +31925,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "mixed"
@@ -31817,5 +31931,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4011
+#: build/trans_presets.java:4024
 msgid "Forest"
 msgstr "森林"
@@ -31824,30 +31938,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4027
 msgid "Edit Forest Landuse"
 msgstr "编辑森林土地利用"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "coniferous"
 msgstr "松类"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "deciduous"
 msgstr "落叶类"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "mixed"
 msgstr "混合"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4020
+#: build/trans_presets.java:4033
 msgid "Nature Reserve"
 msgstr "自然保护区"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4034
 msgid "Edit Nature Reserve"
 msgstr "编辑自然保护区"
@@ -31855,15 +31969,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:4039
 msgid "Scree"
 msgstr "碎石坡"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4040
 msgid "Edit Scree"
 msgstr "编辑碎石坡"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4044
 msgid "Fell"
 msgstr "丘陵"
@@ -31871,20 +31985,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4046
 msgid "Edit Fell"
 msgstr "编辑丘陵"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4037
+#: build/trans_presets.java:4050
 msgid "Scrub"
 msgstr "灌木丛"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4038
+#: build/trans_presets.java:4051
 msgid "Edit Scrub"
 msgstr "编辑灌木丛"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4042
+#: build/trans_presets.java:4055
 msgid "Heath"
 msgstr "荒地"
@@ -31892,15 +32006,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4057
 msgid "Edit Heath"
 msgstr "编辑荒地"
 
 #. group "Land use"
-#: build/trans_presets.java:4049
+#: build/trans_presets.java:4062
 msgid "Land use"
 msgstr "土地利用"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4063
 msgid "Farmyard"
 msgstr "农家庭院"
@@ -31909,40 +32023,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4066
 msgid "Edit Farmyard Landuse"
 msgstr "编辑农家庭院"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4058
+#: build/trans_presets.java:4071
 msgid "Farmland"
 msgstr "农田"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4059
+#: build/trans_presets.java:4072
 msgid "Edit Farmland Landuse"
 msgstr "编辑农田"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4077
 msgid "Meadow"
 msgstr "牧场"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4065
+#: build/trans_presets.java:4078
 msgid "Edit Meadow Landuse"
 msgstr "编辑牧场"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4083
 msgid "Vineyard"
 msgstr "葡萄园"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4084
 msgid "Edit Vineyard Landuse"
 msgstr "编辑葡萄园"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4076
+#: build/trans_presets.java:4089
 msgid "Greenhouse Horticulture"
 msgstr "温室园艺"
@@ -31950,15 +32064,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4091
 msgid "Edit Greenhouse Horticulture"
 msgstr "编辑温室园艺"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4097
 msgid "Allotments"
 msgstr "开心农场(？)"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:4098
 msgid "Edit Allotments Landuse"
 msgstr "编辑市民农场"
@@ -31966,25 +32080,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4104
 msgid "Garden"
 msgstr "花园"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4105
 msgid "Edit Garden"
 msgstr "编辑花园"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4109
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4110
 msgid "Edit Grass Landuse"
 msgstr "编辑草地"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4102
+#: build/trans_presets.java:4115
 msgid "Village Green"
 msgstr "村镇公用绿地"
@@ -31992,10 +32106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4117
 msgid "Edit Village Green Landuse"
 msgstr "编辑村镇公用绿地"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4122
 msgid "Common"
 msgstr "公共用地"
@@ -32003,20 +32117,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4111
+#: build/trans_presets.java:4124
 msgid "Edit Common"
 msgstr "编辑公共用地"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4128
 msgid "Park"
 msgstr "公园"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4116
+#: build/trans_presets.java:4129
 msgid "Edit Park"
 msgstr "编辑公园"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4133
 msgid "Recreation Ground"
 msgstr "游乐场"
@@ -32024,5 +32138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4135
 msgid "Edit Recreation Ground Landuse"
 msgstr "编辑游乐场用地"
@@ -32030,15 +32144,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4141
 msgid "Residential area"
 msgstr "居住区"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4142
 msgid "Edit Residential Landuse"
 msgstr "编辑居住区"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4147
 msgid "Graveyard"
 msgstr "教堂附近的墓地"
@@ -32046,10 +32160,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4136
+#: build/trans_presets.java:4149
 msgid "Edit Graveyard"
 msgstr "编辑墓地"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4155
 msgid "Cemetery"
 msgstr "不靠近教堂的墓地"
@@ -32057,40 +32171,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4157
 msgid "Edit Cemetery Landuse"
 msgstr "编辑墓地"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4151
+#: build/trans_presets.java:4164
 msgid "Retail"
 msgstr "零售"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4152
+#: build/trans_presets.java:4165
 msgid "Edit Retail Landuse"
 msgstr "编辑零售用地"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4170
 msgid "Commercial"
 msgstr "商业"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4158
+#: build/trans_presets.java:4171
 msgid "Edit Commercial Landuse"
 msgstr "编辑商业用地"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4176
 msgid "Industrial"
 msgstr "工业"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4177
 msgid "Edit Industrial Landuse"
 msgstr "编辑工业用地"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4182
 msgid "Garages"
 msgstr "车库"
@@ -32098,10 +32212,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4184
 msgid "Edit Garages"
 msgstr "编辑车库"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4190
 msgid "Railway land"
 msgstr "铁路用地"
@@ -32109,15 +32223,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4192
 msgid "Edit Railway Landuse"
 msgstr "编辑铁路用地"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4197
 msgid "Military"
 msgstr "军事"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4185
+#: build/trans_presets.java:4198
 msgid "Edit Military Landuse"
 msgstr "编辑军事用地"
@@ -32125,55 +32239,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4191
+#: build/trans_presets.java:4204
 msgid "Construction area"
 msgstr "建筑区"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4205
 msgid "Edit Construction Landuse"
 msgstr "编辑建筑区"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4210
 msgid "Brownfield"
-msgstr "棕色地带"
+msgstr "废弃土地(棕地)"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4211
 msgid "Edit Brownfield Landuse"
 msgstr "编辑废弃土地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4203
+#: build/trans_presets.java:4216
 msgid "Greenfield"
-msgstr "绿地"
+msgstr "未开发土地"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4217
 msgid "Edit Greenfield Landuse"
-msgstr "编辑绿地"
+msgstr "编辑未开发土地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4209
+#: build/trans_presets.java:4222
 msgid "Landfill"
 msgstr "垃圾填埋场"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4223
 msgid "Edit Landfill Landuse"
 msgstr "编辑垃圾填埋场"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4215
+#: build/trans_presets.java:4228
 msgid "Quarry"
 msgstr "采石场"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4229
 msgid "Edit Quarry Landuse"
 msgstr "编辑采石场"
 
 #. group "Annotation"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4236
 msgid "Annotation"
 msgstr "注释"
@@ -32181,5 +32295,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4224
+#: build/trans_presets.java:4237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -32190,5 +32304,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4227
+#: build/trans_presets.java:4240
 msgid "Edit Address Information"
 msgstr "编辑地址信息"
@@ -32196,5 +32310,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4242
 msgid "House number"
 msgstr "门牌号码"
@@ -32202,5 +32316,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4231
+#: build/trans_presets.java:4244
 msgid "House name"
 msgstr "房屋名称"
@@ -32209,55 +32323,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4232 build/trans_presets.java:4386
+#: build/trans_presets.java:4245 build/trans_presets.java:4399
 msgid "Street name"
 msgstr "街道名称"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4233
+#: build/trans_presets.java:4246
 msgid "City name"
 msgstr "城市名称"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4234
+#: build/trans_presets.java:4247
 msgid "Post code"
 msgstr "邮政编号"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "Country code"
 msgstr "国家代码"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "AT"
 msgstr "奥地利(AT)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "CH"
 msgstr "瑞士(CH)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "DE"
 msgstr "德国(DE)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "FR"
 msgstr "法国(FR)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "GB"
 msgstr "英国(GB)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "IT"
 msgstr "意大利(IT)"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "US"
 msgstr "美国(US)"
@@ -32265,5 +32379,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4238
+#: build/trans_presets.java:4251
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -32275,5 +32389,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4241
+#: build/trans_presets.java:4254
 msgid "Edit Address Interpolation"
 msgstr "编辑地址插值方法"
@@ -32281,35 +32395,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "Numbering scheme"
 msgstr "编号规则"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "odd"
 msgstr "奇数"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "even"
 msgstr "偶数"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "alphabetic"
 msgstr "按字母顺序"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4245
+#: build/trans_presets.java:4258
 msgid "Contact"
 msgstr "联系方式"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4259
 msgid "Edit Contact information"
 msgstr "编辑联系方式信息"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4255
+#: build/trans_presets.java:4268
 msgid "Image"
 msgstr "图像"
@@ -32319,5 +32433,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4263
+#: build/trans_presets.java:4276
 msgid "Edit Multipolygon"
 msgstr "编辑多重多边形"
@@ -32329,5 +32443,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4269 build/trans_presets.java:4286
+#: build/trans_presets.java:4282 build/trans_presets.java:4299
 msgid "outer segment"
 msgstr "外围"
@@ -32335,5 +32449,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4270 build/trans_presets.java:4287
+#: build/trans_presets.java:4283 build/trans_presets.java:4300
 msgid "inner segment"
 msgstr "内围"
@@ -32341,5 +32455,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4273
+#: build/trans_presets.java:4286
 msgid "Boundary"
 msgstr "边界"
@@ -32350,5 +32464,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4278
+#: build/trans_presets.java:4291
 msgid "Edit Boundary"
 msgstr "编辑边界"
@@ -32356,40 +32470,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "Boundary type"
 msgstr "边界类型"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "administrative"
 msgstr "行政区界"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "national"
 msgstr "国界"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "civil"
 msgstr "市界"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "political"
 msgstr "政治分界"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4283
+#: build/trans_presets.java:4296
 msgid "Administrative level"
 msgstr "行政区界等级"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4288
+#: build/trans_presets.java:4301
 msgid "Sub area"
 msgstr "郊区"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4289
+#: build/trans_presets.java:4302
 msgid "Administration centre"
 msgstr "行政中心"
@@ -32397,5 +32511,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4292
+#: build/trans_presets.java:4305
 msgid "Turn restriction"
 msgstr "转弯限制"
@@ -32404,5 +32518,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4308
 msgid "Edit Turn Restriction"
 msgstr "编辑转弯限制"
@@ -32410,40 +32524,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "Restriction"
 msgstr "限制"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_left_turn"
 msgstr "禁止左转"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_right_turn"
 msgstr "禁止右转"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_straight_on"
 msgstr "禁止直行"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_u_turn"
 msgstr "禁止掉头"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_right_turn"
 msgstr "只可右转"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_left_turn"
 msgstr "只可左转"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_straight_on"
 msgstr "只可直行"
@@ -32452,16 +32566,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4315
 msgid "from way"
 msgstr "出发 路径"
 
 #. item "Relations/Turn restriction" role "via node or ways"
-#: build/trans_presets.java:4303
-#, fuzzy
+#: build/trans_presets.java:4316
 msgid "via node or ways"
 msgstr "经过 节点或路径"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4304
+#: build/trans_presets.java:4317
 msgid "to way"
 msgstr "到达 路径"
@@ -32469,5 +32582,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4307
+#: build/trans_presets.java:4320
 msgid "Route"
 msgstr "路线"
@@ -32481,5 +32594,5 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4328
 msgid "Edit Route"
 msgstr "编辑路线"
@@ -32489,5 +32602,5 @@
 #. <key key="type" value="route" />
 #. item "Relations/Directional Route (North America)" combo "Route type"
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "Route type"
 msgstr "路线类型"
@@ -32495,5 +32608,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32503,5 +32616,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "road"
 msgstr "道路"
@@ -32509,5 +32622,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ferry"
 msgstr "渡轮"
@@ -32515,5 +32628,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ski"
 msgstr "滑雪"
@@ -32566,5 +32679,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:199 build/trans_style.java:531
 #: build/trans_style.java:537 build/trans_style.java:557
@@ -32576,5 +32689,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "hiking"
 msgstr "健行"
@@ -32582,5 +32695,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32590,5 +32703,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "detour"
 msgstr "绕行"
@@ -32602,5 +32715,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
@@ -32611,5 +32724,5 @@
 #. item "Relations/Route" text "Symbol description"
 #. item "Relations/Directional Route (North America)" text "Symbol description"
-#: build/trans_presets.java:4320 build/trans_presets.java:4350
+#: build/trans_presets.java:4333 build/trans_presets.java:4363
 msgid "Symbol description"
 msgstr "符号说明"
@@ -32621,6 +32734,6 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4323 build/trans_presets.java:4353
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4336 build/trans_presets.java:4366
+#: build/trans_presets.java:4388
 msgid "Network"
 msgstr "网络"
@@ -32628,5 +32741,5 @@
 #. item "Relations/Route" combo "Route state"
 #. item "Relations/Directional Route (North America)" combo "Route state"
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "Route state"
 msgstr "路线状况"
@@ -32634,5 +32747,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "proposed"
 msgstr "建议"
@@ -32640,5 +32753,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "alternate"
 msgstr "备用"
@@ -32646,5 +32759,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "temporary"
 msgstr "临时"
@@ -32652,5 +32765,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "connection"
 msgstr "连接"
@@ -32658,5 +32771,5 @@
 #. item "Relations/Route" text "Color (hex)"
 #. item "Relations/Directional Route (North America)" text "Color (hex)"
-#: build/trans_presets.java:4326 build/trans_presets.java:4356
+#: build/trans_presets.java:4339 build/trans_presets.java:4369
 msgid "Color (hex)"
 msgstr "颜色(16 进制)"
@@ -32668,15 +32781,15 @@
 #. <roles>
 #. item "Relations/Directional Route (North America)" role "route segment"
-#: build/trans_presets.java:4329 build/trans_presets.java:4359
+#: build/trans_presets.java:4342 build/trans_presets.java:4372
 msgid "route segment"
 msgstr "路线区段"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4330
+#: build/trans_presets.java:4343
 msgid "forward segment"
 msgstr "顺向区段"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4331
+#: build/trans_presets.java:4344
 msgid "backward segment"
 msgstr "逆向区段"
@@ -32684,5 +32797,5 @@
 #. item "Relations/Route" role "halt point"
 #. item "Relations/Directional Route (North America)" role "halt point"
-#: build/trans_presets.java:4332 build/trans_presets.java:4364
+#: build/trans_presets.java:4345 build/trans_presets.java:4377
 msgid "halt point"
 msgstr "停止点"
@@ -32690,5 +32803,5 @@
 #. item "Relations/Route" role "forward halt point"
 #. item "Relations/Directional Route (North America)" role "forward halt point"
-#: build/trans_presets.java:4333 build/trans_presets.java:4365
+#: build/trans_presets.java:4346 build/trans_presets.java:4378
 msgid "forward halt point"
 msgstr "顺向停止点"
@@ -32696,5 +32809,5 @@
 #. item "Relations/Route" role "backward halt point"
 #. item "Relations/Directional Route (North America)" role "backward halt point"
-#: build/trans_presets.java:4334 build/trans_presets.java:4366
+#: build/trans_presets.java:4347 build/trans_presets.java:4379
 msgid "backward halt point"
 msgstr "逆向停止点"
@@ -32702,7 +32815,7 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4337
+#: build/trans_presets.java:4350
 msgid "Directional Route (North America)"
-msgstr ""
+msgstr "定向路线(北美)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
@@ -32714,35 +32827,31 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
-#: build/trans_presets.java:4345
+#: build/trans_presets.java:4358
 msgid "Edit Directional Route (used in North America)"
-msgstr ""
+msgstr "编辑定向路线(在北美使用)"
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4360
-#, fuzzy
+#: build/trans_presets.java:4373
 msgid "east segment"
-msgstr "外围"
+msgstr "东段"
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4361
-#, fuzzy
+#: build/trans_presets.java:4374
 msgid "north segment"
-msgstr "外围"
+msgstr "北段"
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4362
-#, fuzzy
+#: build/trans_presets.java:4375
 msgid "west segment"
-msgstr "外围"
+msgstr "西段"
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4363
-#, fuzzy
+#: build/trans_presets.java:4376
 msgid "south segment"
-msgstr "外围"
+msgstr "南段"
 
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4369
+#: build/trans_presets.java:4382
 msgid "Route network"
 msgstr "线路网络"
@@ -32750,5 +32859,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4371
+#: build/trans_presets.java:4384
 msgid "Edit route network"
 msgstr "编辑线路网络"
@@ -32757,5 +32866,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4379
+#: build/trans_presets.java:4392
 msgid "member"
 msgstr "成员"
@@ -32763,5 +32872,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4395
 msgid "Associated street"
 msgstr "相关街道"
@@ -32769,10 +32878,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4384
+#: build/trans_presets.java:4397
 msgid "Edit associated street"
 msgstr "编辑相关街道"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4389
+#: build/trans_presets.java:4402
 msgid "house"
 msgstr "房"
@@ -35539,5 +35648,5 @@
 #: build/trans_style.java:2785
 msgid "brownfield"
-msgstr "棕色地带"
+msgstr "废弃土地"
 
 #. <icon src="misc/no_icon.png"/>
@@ -35549,5 +35658,5 @@
 #: build/trans_style.java:2791
 msgid "greenfield"
-msgstr "绿地"
+msgstr "未开发土地"
 
 #. <icon src="misc/no_icon.png"/>
@@ -36249,26 +36358,23 @@
 msgstr "用于步道的限速标签"
 
-#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
-#: build/trans_validator.java:70
-msgid "oneway combined with *:backward/forward"
-msgstr ""
-
+#. see #5844, #6760
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:72
+#: build/trans_validator.java:73
 msgid "layer tag with + sign"
 msgstr "有 + 号的图层标签"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:74
+#: build/trans_validator.java:75
 msgid "street name contains ss"
 msgstr "街道名称包含 ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:76
+#: build/trans_validator.java:77
 msgid "relation without type"
 msgstr "没有类型的关系"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "restaurant without name"
 msgstr "没有名称的餐馆"
@@ -36277,236 +36383,548 @@
 #. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:81
+#: build/trans_validator.java:82
 msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "不常见的标签组合(公路和水路)"
 
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:82
+#: build/trans_validator.java:83
 msgid "unusual tag combination (highway & natural)"
-msgstr ""
-
-#. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
-#. http://irs.gis-lab.info/?layers=landsat&
-#: build/trans_wms.java:2
+msgstr "不常见的标签组合(公路和自然)"
+
+#. <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+#. <imagery>
+#. <!--true;Landsat;http://irs.gis-lab.info/?layers=landsat&-->
+#. <entry>
+#. <name>Landsat</name>
+#: build/trans_wms.java:5
 msgid "Landsat"
 msgstr "Landsat"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#: build/trans_wms.java:3
+#. <type>wms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. </entry>
+#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>Open Aerial Map</name>
+#: build/trans_wms.java:12
 msgid "Open Aerial Map"
 msgstr "开放航拍图"
 
-#. bing:bing
-#: build/trans_wms.java:4
+#. <type>wms</type>
+#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
+#. </entry>
+#. <!--different forms for web access-->
+#. <!--true;Bing Sat;bing:bing-->
+#. <entry>
+#. <name>Bing Sat</name>
+#: build/trans_wms.java:19
 msgid "Bing Sat"
 msgstr "Bing Sat"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
-#: build/trans_wms.java:5
+#. <type>bing</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://www.bing.com/maps/</url>
+#. <default>true</default>
+#. </entry>
+#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
+#. <entry>
+#. <name>Yahoo Sat</name>
+#: build/trans_wms.java:27
 msgid "Yahoo Sat"
 msgstr "Yahoo Sat"
 
-#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png
-#: build/trans_wms.java:6
+#. <type>html</type>
+#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
+#. </entry>
+#. <!--Tile based access-->
+#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#. <entry>
+#. <name>MapQuest Open Aerial</name>
+#: build/trans_wms.java:34
 msgid "MapQuest Open Aerial"
 msgstr ""
 
-#. tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm
-#: build/trans_wms.java:7
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png]]></url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik);tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm-->
+#. <entry>
+#. <namUse of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. e>OpenStreetMap (Mapnik)</name>
+#: build/trans_wms.java:42
 msgid "OpenStreetMap (Mapnik)"
 msgstr "OpenStreetMap (Mapnik)"
 
-#. tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:8
-msgid "OpenStreetMap (Mapnik B&W)"
-msgstr ""
-
-#. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
-#: build/trans_wms.java:9
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenCycleMap</name>
+#: build/trans_wms.java:62
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm
-#: build/trans_wms.java:10
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#. <entry>
+#. <name>TilesAtHome</name>
+#: build/trans_wms.java:71
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm
-#: build/trans_wms.java:11
+#. <type>tms</type>
+#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#. <entry>
+#. <name>MapQuest OSM</name>
+#: build/trans_wms.java:80
 msgid "MapQuest OSM"
 msgstr ""
 
-#. tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm
-#: build/trans_wms.java:12
+#. <type>tms</type>
+#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
+#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#. <entry>
+#. <name>ODBL coverage</name>
+#: build/trans_wms.java:90
 msgid "ODBL coverage"
 msgstr ""
 
-#. tms[18]:http://tile.xn--pnvkarte-m4a.de/tilegen;;;osm;osm;osm
-#: build/trans_wms.java:13
-msgid "PNV"
-msgstr ""
-
-#. tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:14
+#. <type>tms</type>
+#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--only for Europe-->
+#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#. <entry>
+#. <name>ÖPNV</name>
+#: build/trans_wms.java:101
+msgid "ÖPNV"
+msgstr ""
+
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--false;German Style;tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>German Style</name>
+#: build/trans_wms.java:111
 msgid "German Style"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#: build/trans_wms.java:15
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--only for Germany-->
+#. <!--false;Streets NRW Geofabrik.de;http:/Use of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. /tools.geofabrik.de/osmi/view/strassennrw/josmwms?-->
+#. <entry>
+#. <name>Streets NRW Geofabrik.de</name>
+#: build/trans_wms.java:123
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm
-#: build/trans_wms.java:16
-msgid "Hike & Bike"
-msgstr ""
-
-#. tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm
-#: build/trans_wms.java:17
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Sorbische Karte;tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm-->
+#. <entry>
+#. <name>Sorbische Karte</name>
+#: build/trans_wms.java:140
 msgid "Sorbische Karte"
 msgstr ""
 
-#. tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm
-#: build/trans_wms.java:18
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Deutsche Karte;tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm-->
+#. <entry>
+#. <name>Deutsche Karte</name>
+#: build/trans_wms.java:150
 msgid "Deutsche Karte"
 msgstr ""
 
-#. tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm
-#: build/trans_wms.java:19
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;OpenPT Map;tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm-->
+#. <entry>
+#. <name>OpenPT Map</name>
+#: build/trans_wms.java:160
 msgid "OpenPT Map"
 msgstr ""
 
-#. wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&
-#: build/trans_wms.java:20
+#. <type>tms</type>
+#. <url><![CDATA[http://openptmap.de/tiles/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>16</max-zoom>
+#. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Bayern (2m);wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&-->
+#. <entry>
+#. <name>Bayern (2m)</name>
+#: build/trans_wms.java:172
 msgid "Bayern (2m)"
 msgstr ""
 
-#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
-#: build/trans_wms.java:21
+#. <type>wms</type>
+#. <url><![CDATA[http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--only for Austria-->
+#. <!--false;Geoimage.at;http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&-->
+#. <entry>
+#. <name>Geoimage.at</name>
+#: build/trans_wms.java:180
 msgid "Geoimage.at"
 msgstr ""
 
-#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
-#: build/trans_wms.java:22
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&]]></url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--false;Geoimage.at (HighRes);wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste-->
+#. <entry>
+#. <name>Geoimage.at (HighRes)</name>
+#: build/trans_wms.java:187
 msgid "Geoimage.at (HighRes)"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#. <type>wms</type>
+#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&]]></url>
+#. <bounds min-lat='9.35676' min-lon='46.0872' max-lat='17.3099' max-lon='49.2092'/>
+#. <attribution-text mandatory='true'>geoimage.at</attribution-text>
+#. <terms-of-use-url>http://www.geoimage.at/geoimage/geodatendienste</terms-of-use-url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--only for North America-->
+#. <!--Terraserver USCG - High resolution maps-->
+#. <!--false;MSR Maps Topo;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Topo</name>
+#: build/trans_wms.java:199
 msgid "MSR Maps Topo"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:24
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--false;MSR Maps Urban;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Urban</name>
+#: build/trans_wms.java:206
 msgid "MSR Maps Urban"
 msgstr ""
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:25
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--only for Czech Republic-->
+#. <!--false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&-->
+#. <entry>
+#. <name>Czech CUZK:KM</name>
+#: build/trans_wms.java:214
 msgid "Czech CUZK:KM"
 msgstr "捷克 CUZK：KM"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:26
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Czech UHUL:ORTOFOTO</name>
+#: build/trans_wms.java:221
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "捷克 UHUL：ORTOFOTO"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:27
+#. <type>wms</type>
+#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--only for GB-->
+#. <!--false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&-->
+#. <entry>
+#. <name>NPE Maps</name>
+#: build/trans_wms.java:229
 msgid "NPE Maps"
 msgstr "英国地形测量局新大众版 (NPE) 地图"
 
-#. http://timsc.dev.openstreetmap.org/wms2/map.php?
-#: build/trans_wms.java:28
+#. <type>wms</type>
+#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
+#. <entry>
+#. <name>NPE Maps (Tim)</name>
+#: build/trans_wms.java:236
 msgid "NPE Maps (Tim)"
 msgstr ""
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:29
+#. <type>wms</type>
+#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
+#. <entry>
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:243
 msgid "7th Series (OS7)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#. <type>wms</type>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--only for Japan-->
+#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO)</name>
+#: build/trans_wms.java:251
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO01)</name>
+#: build/trans_wms.java:258
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO02)</name>
+#: build/trans_wms.java:265
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:33
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO03)</name>
+#: build/trans_wms.java:272
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:34
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--only for Italy-->
+#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Lodi - Italy</name>
+#: build/trans_wms.java:280
 msgid "Lodi - Italy"
 msgstr ""
 
-#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:35
+#. <type>wms</type>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Sicily - Italy</name>
+#: build/trans_wms.java:287
 msgid "Sicily - Italy"
 msgstr ""
 
-#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:36
+#. <type>wms</type>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#. <entry>
+#. <name>PCN 2006 - Italy</name>
+#: build/trans_wms.java:294
 msgid "PCN 2006 - Italy"
 msgstr ""
 
-#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:37
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--only for France-->
+#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#. <entry>
+#. <name>SPOTMaps (France)</name>
+#: build/trans_wms.java:302
 msgid "SPOTMaps (France)"
 msgstr ""
 
-#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:38
+#. <type>wms</type>
+#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
+#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <!--only for Spain-->
+#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#. <entry>
+#. <name>PNOA Spain</name>
+#: build/trans_wms.java:311
 msgid "PNOA Spain"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:39
+#. <type>wms</type>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <country-code>ES</country-code>
+#. </entry>
+#. <!--only for Estonia-->
+#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#. <entry>
+#. <name>Estonia Basemap (Maaamet)</name>
+#: build/trans_wms.java:320
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:40
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Estonia Ortho (Maaamet)</name>
+#: build/trans_wms.java:327
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:41
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#. <entry>
+#. <name>Estonia Multi (Maaamet)</name>
+#: build/trans_wms.java:334
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
-#. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:42
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--only for Denmark-->
+#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#. <entry>
+#. <name>Fugro (Denmark)</name>
+#: build/trans_wms.java:342
 msgid "Fugro (Denmark)"
 msgstr ""
 
-#. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:43
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
+#. <max-zoom>19</max-zoom>
+#. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
+#. <terms-of-use-url>http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2</terms-of-use-url>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--false;Stevns (Denmark);tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune-->
+#. <entry>
+#. <name>Stevns (Denmark)</name>
+#: build/trans_wms.java:354
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
-#: build/trans_wms.java:44
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='55.23403' min-lon='12.09144' max-lat='55.43647' max-lon='12.47712'/>
+#. <max-zoom>20</max-zoom>
+#. <attribution-text mandatory='true'>Stevns Kommune</attribution-text>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--only for Phillipines-->
+#. <!--false;Pangasinan (Phillipines HiRes);tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines-->
+#. <entry>
+#. <name>Pangasinan (Phillipines HiRes)</name>
+#: build/trans_wms.java:365
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
-#. scanex:irs;;;IRS
-#: build/trans_wms.java:45
+#. <type>tms</type>
+#. <url><![CDATA[http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png]]></url>
+#. <country-code>PH</country-code>
+#. </entry>
+#. <!--only for Russia-->
+#. <!--false;ScanEx IRS;scanex:irs;;;IRS-->
+#. <entry>
+#. <name>ScanEx IRS</name>
+#: build/trans_wms.java:373
 msgid "ScanEx IRS"
 msgstr ""
 
-#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
-#: build/trans_wms.java:46
+#. <type>scanex</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://irs.gis-lab.info/</url>
+#. <attribution-text mandatory='true'>IRS</attribution-text>
+#. <country-code>RU</country-code>
+#. </entry>
+#. <!--only for South Africa-->
+#. <!--false;South Africa Topo (OOC);tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1-->
+#. <entry>
+#. <name>South Africa Topo (OOC)</name>
+#: build/trans_wms.java:383
 msgid "South Africa Topo (OOC)"
 msgstr ""
@@ -37827,5 +38245,5 @@
 msgstr ""
 "在缓存中找到位置“{0}”。\n"
-"是否先载入缓存？\n"
+"是否先加载缓存？\n"
 "(否 = 新增缓存)"
 
@@ -37843,5 +38261,5 @@
 "Probably an old version of the cache file."
 msgstr ""
-"载入文件时发生错误。\n"
+"加载文件时发生错误。\n"
 "可能是旧版的缓存文件。"
 
@@ -37950,5 +38368,5 @@
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr "警告：无法将选项窗格置于最上层。例外为：{0}"
+msgstr "警告：无法将选项窗格置于最上层。异常为：{0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -38271,5 +38689,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:39
 msgid "Image already loaded"
-msgstr "图片已载入"
+msgstr "图片已加载"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:75
@@ -38414,5 +38832,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:25
 msgid "Load location from cache (only if cache is enabled)"
-msgstr "从缓存载入位置(只有在缓存已启用时)"
+msgstr "从缓存加载位置(只有在缓存已启用时)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:45
@@ -38425,5 +38843,5 @@
 msgid ""
 "Cannot load cache {0} which is not compatible with current projection zone"
-msgstr "不能载入缓存 {0}，因为与目前的投影法区域不相容"
+msgstr "不能加载缓存 {0}，因为与目前的投影法区域不相容"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
@@ -38436,5 +38854,5 @@
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr "位置 {0} 已经在画面上。缓存未载入。"
+msgstr "位置 {0} 已经在画面上。缓存未加载。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
@@ -38525,5 +38943,5 @@
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr "WMS 图层 ({0})，已载入 {1} 个拼贴"
+msgstr "WMS 图层 ({0})，已加载 {1} 个拼贴"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:235
@@ -38952,5 +39370,5 @@
 "plugin/"
 msgstr ""
-"不能载入 rxtxSerial 程序库。如果您需要安装上的支持，试试在 http://www."
+"不能加载 rxtxSerial 程序库。如果您需要安装上的支持，试试在 http://www."
 "raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首页"
 
@@ -39568,5 +39986,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
-msgstr "将多组图片载入为新的图层。"
+msgstr "将多组图片加载为新的图层。"
 
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:24
@@ -39627,5 +40045,5 @@
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
 msgid "Hide this"
-msgstr ""
+msgstr "隐藏这个"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
@@ -39635,13 +40053,13 @@
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
-msgstr ""
+msgstr "没有时间戳"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
-msgstr ""
+msgstr "千米/时"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
-msgstr ""
+msgstr "轨迹名： "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40079,13 +40497,13 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:101
 msgid "Loading"
-msgstr ""
+msgstr "加载中"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:142
 msgid "Loading from Quick History Service..."
-msgstr ""
+msgstr "正在从快速历史服务中加载..."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:146
 msgid "Analyzing..."
-msgstr ""
+msgstr "分析..."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
@@ -40114,23 +40532,23 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
 msgid "license check error"
-msgstr ""
+msgstr "许可证检查错误"
 
 #. * Warning messages
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:19
 msgid "Possible data loss"
-msgstr ""
+msgstr "数据可能丢失"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
 msgid "license check warning"
-msgstr ""
+msgstr "许可证检查警告"
 
 #. * Other messages
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:23
 msgid "Data reduction"
-msgstr ""
+msgstr "数据减少"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
 msgid "license check notice"
-msgstr ""
+msgstr "许可证检查通知"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
@@ -40277,12 +40695,10 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
-#, fuzzy
 msgid "Merge overlap"
-msgstr "合并图层"
+msgstr ""
 
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
-#, fuzzy
 msgid "Merge overlap of ways."
-msgstr "重叠的路径。"
+msgstr ""
 
 #. Commit
@@ -40341,9 +40757,9 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68
 msgid "Native password manager plugin"
-msgstr ""
+msgstr "本地密码管理器插件"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
 msgid "No native password manager could be found!"
-msgstr ""
+msgstr "没有本地密码管理器可以找到！"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
@@ -40351,9 +40767,9 @@
 "Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
-msgstr ""
+msgstr "根据您的操作系统/配置，您可能需要首先创建一个默认的密钥环/钱包。"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
 msgid "No thanks, use JOSM''s plain text preferences storage"
-msgstr ""
+msgstr "不，谢谢，使用 JOSM 的纯文本首选项存储"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
@@ -40361,86 +40777,86 @@
 "Found sensitive data that is still saved in JOSM''s preference file (plain "
 "text)."
-msgstr ""
+msgstr "找到仍然保存在 JOSM 的首选项文件(纯文本)中的敏感数据。"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
 msgid "Transfer to password manager and remove from preference file"
-msgstr ""
+msgstr "转移到密码管理器，并从首选项文件中删除"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
 msgid "No, just keep it"
-msgstr ""
+msgstr "不，就保持它"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
 msgid "Close the dialog and discard all changes"
-msgstr ""
+msgstr "关闭对话框并放弃所有更改"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
 msgid "Proceed and go to the next page"
-msgstr ""
+msgstr "继续到下一个页面"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
 msgid "Finish"
-msgstr ""
+msgstr "完成"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
 msgid "Confirm the setup and close this dialog"
-msgstr ""
+msgstr "确认设置并关闭此对话框"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
 msgid "JOSM/OSM API/Username"
-msgstr ""
+msgstr "JOSM/OSM API/用户名"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
 msgid "JOSM/OSM API/Password"
-msgstr ""
+msgstr "JOSM/OSM API/密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
 msgid "JOSM/Proxy/Username"
-msgstr ""
+msgstr "JOSM/Proxy/用户名"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
 msgid "JOSM/Proxy/Password"
-msgstr ""
+msgstr "JOSM/Proxy/密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
 msgid "JOSM/OAuth/OSM API/Key"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/键"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
 msgid "JOSM/OAuth/OSM API/Secret"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
 msgid "Native Password Manager Plugin"
-msgstr ""
+msgstr "本地密码管理器插件"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
 #, java-format
 msgid "The username and password is protected by {0}."
-msgstr ""
+msgstr "用户名和密码被 {0} 保护。"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
 msgid "username"
-msgstr ""
+msgstr "用户名"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
 msgid "password"
-msgstr ""
+msgstr "密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
 msgid "proxy username"
-msgstr ""
+msgstr "代理用户名"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
 msgid "proxy password"
-msgstr ""
+msgstr "代理密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
 msgid "oauth key"
-msgstr ""
+msgstr "oauth 键"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
 msgid "oauth secret"
-msgstr ""
+msgstr "oauth 密码"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
@@ -40450,13 +40866,14 @@
 "preference file. ({0})"
 msgstr ""
+"<br><strong>警告：</strong>有可能有敏感数据留在您的首选项设置文件中。({0})"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242
 #, java-format
 msgid "Save user and password ({0})"
-msgstr ""
+msgstr "保存用户名和密码({0})"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:16
 msgid "Plain text, JOSM default"
-msgstr ""
+msgstr "纯文本，JOSM 默认"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:22
@@ -40465,14 +40882,14 @@
 #, java-format
 msgid "Use {0}"
-msgstr ""
+msgstr "使用 {0}"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38
 msgid "Encrypt data with Windows logon credentials"
-msgstr ""
+msgstr "用 Windows 登录凭据加密数据"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:42
 #, java-format
 msgid "The native password manager plugin detected {0} on your system."
-msgstr ""
+msgstr "本地密码管理器插件检测到您的系统中有 {0}。"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -40717,5 +41134,5 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:246
 msgid "Load file..."
-msgstr "载入文件..."
+msgstr "加载文件..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:247
@@ -40824,5 +41241,5 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544
 msgid "Loading..."
-msgstr "载入中..."
+msgstr "加载中..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:556
@@ -40832,5 +41249,5 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:571
 msgid "Loaded"
-msgstr "已载入"
+msgstr "已加载"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:613
@@ -41072,14 +41489,14 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
 msgid "Load Picture Calibration..."
-msgstr "载入图片校准..."
+msgstr "加载图片校准..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
 msgid "Loads calibration data from a file"
-msgstr "从文件载入校准数据"
+msgstr "从文件加载校准数据"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
 #, java-format
 msgid "Loading file failed: {0}"
-msgstr "载入文件失败：{0}"
+msgstr "加载文件失败：{0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
@@ -41109,5 +41526,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
-msgstr "PicLayer 无法载入或导入图片。"
+msgstr "PicLayer 无法加载或导入图片。"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
@@ -41138,5 +41555,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
-msgstr "是否载入校准文件？"
+msgstr "是否加载校准文件？"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
@@ -42073,5 +42490,5 @@
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:223
 msgid "Load"
-msgstr "载入"
+msgstr "加载"
 
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:274
@@ -42401,5 +42818,5 @@
 #, java-format
 msgid "{0} Signatures loaded. All referenced OSM objects found."
-msgstr "已载入 {0} 个签名。找到所有参照的 OSM 的对象。"
+msgstr "已加载 {0} 个签名。找到所有参照的 OSM 的对象。"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:45
@@ -42414,5 +42831,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:45
 msgid "Load objects from server"
-msgstr "从服务器载入对象"
+msgstr "从服务器加载对象"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:38
@@ -42975,5 +43392,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:426
 msgid "Pending errors and warnings"
-msgstr "未决的错误和警告"
+msgstr "待解决的错误和警告"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:485
@@ -43157,9 +43574,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:195
 msgid "Use standard exceptions"
-msgstr "使用标准例外"
+msgstr "使用标准异常"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:205
 msgid "Use non-standard exceptions"
-msgstr "使用非标准例外"
+msgstr "使用非标准异常"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:157
@@ -43234,5 +43651,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
 msgid "Open an editor for the selected turn restriction"
-msgstr ""
+msgstr "打开选定转弯限制的编辑器"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43513,5 +43930,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
-msgstr "转到基本编辑器并选择基于标准车辆类型的例外"
+msgstr "转到基本编辑器并选择基于标准车辆类型的异常"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
@@ -43680,4 +44097,29 @@
 msgstr "从线条中提取节点"
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#, fuzzy
+msgid "Open custom URL"
+msgstr "打开一个 URL。"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#, fuzzy
+msgid "Opens specified URL browser"
+msgstr "在浏览器中打开"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:141
+msgid ""
+"You can open custom URL for <b>one</b> selected object<br/> <b>&#123;"
+"key&#125;</b> is replaced with the tag walue<br/> <b>&#123;#id&#125;</b> is "
+"replaced with the element ID<br/> <b>&#123;#type&#125;</b> is replaced with "
+"\"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;"
+"</b> is replaced with element latitude/longitude"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:151
+#, fuzzy
+msgid "Configure custom URL"
+msgstr "设定网站..."
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
@@ -43734,5 +44176,5 @@
 msgstr "已拆开关系"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
 msgid "More tools"
 msgstr "更多工具(R)"
@@ -44220,25 +44662,2 @@
 msgid "Drive a race car on this layer"
 msgstr "在这个图层驾驶赛车"
-
-#~ msgid ""
-#~ "<b>tags:</b>... - object with given number of tags (tags:count or tags:"
-#~ "min-max)"
-#~ msgstr "<b>tags:</b>... - 以此数字为标签的对象(tags:count 或 tags:min-max)"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" way."
-#~ msgstr "“出发”路径没有开始或结束于“经过”路径"
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" way."
-#~ msgstr "“到达”路径没有开始或结束于“经过”路径"
-
-#~ msgid "Reversed water: land not on left side"
-#~ msgstr "反转的水域：陆地不在左侧"
-
-#~ msgid "Incline Steep"
-#~ msgstr "险坡"
-
-#~ msgid "fossil"
-#~ msgstr "化石燃料"
-
-#~ msgid "wind_turbine"
-#~ msgstr "风机"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 26612)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 26613)
@@ -4,9 +4,27 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2009
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://tile.openstreetmap.org/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik B&W);tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#. <type>wms</type>
+#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Hike & Bike;tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm-->
+#. <entry>
+#. <name>Hike &amp; Bike</name>
+#: build/trans_wms.java:52 build/trans_wms.java:130
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 16:10+0200\n"
+"POT-Creation-Date: 2011-09-02 21:25+0200\n"
 "PO-Revision-Date: 2011-07-17 04:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,6 +35,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-08-28 11:55+0000\n"
-"X-Generator: Launchpad (build 13794)\n"
+"X-Launchpad-Export-Date: 2011-09-02 19:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -26,6 +44,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -51,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
@@ -69,5 +87,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:444
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -85,6 +103,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:254
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
@@ -165,6 +183,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:397
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
@@ -369,5 +387,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -393,10 +411,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:109
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:157
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
@@ -409,5 +427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:104
@@ -452,4 +470,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "Cancel"
 msgstr "取消"
@@ -515,5 +534,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -559,6 +578,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
@@ -596,4 +615,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -630,5 +650,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:70
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -816,6 +836,6 @@
 msgstr "請選擇至少兩個以上的路徑來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:120
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:368
@@ -824,11 +844,19 @@
 msgstr "複製"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr "複製選取的物件到剪貼簿"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:69
 msgid "Please select something to copy."
 msgstr "請選擇物件"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+msgid "Copy Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+msgid "Copy coordinates of selected nodes to clipboard."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
@@ -1212,5 +1240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:122
@@ -1231,4 +1259,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
 msgid "OK"
 msgstr "確定"
@@ -1459,14 +1488,14 @@
 msgstr "無法分析經/緯"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "修正的圖片..."
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
 msgstr "從多種服務下載修正的圖片"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
 #, java-format
 msgid "WMS: {0}"
@@ -1477,26 +1506,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
 msgstr "自訂 WMS 連結"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:114
 msgid "Supported Rectifier Services:"
 msgstr "支援的修正器服務："
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:140
 msgid "Visit Homepage"
 msgstr "參觀首頁"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:151
 msgid "WMS URL or Image ID:"
 msgstr "WMS URL 或圖片 ID："
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:157
 msgid "Add Rectified Image"
 msgstr "加入修正的圖片"
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:209
 msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
@@ -1504,5 +1533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
 msgid "No valid WMS URL or id"
 msgstr "沒有有效的 WMS URL 或 id"
@@ -1606,7 +1635,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "up"
 msgstr "上"
@@ -1644,7 +1673,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "down"
 msgstr "下"
@@ -1681,5 +1710,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:443
 msgid "Cannot move objects outside of the world."
 msgstr "不能將物件移動到世界外頭"
@@ -1738,9 +1767,5 @@
 msgstr "開啟檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
-msgid "Opening 1 file..."
-msgstr "正在開啟 1 個檔案..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
 #, java-format
 msgid "Opening {0} file..."
@@ -1748,5 +1773,5 @@
 msgstr[0] "正在開啟 {0} 個檔案..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1787,5 +1812,5 @@
 msgstr "下載資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1800,28 +1825,28 @@
 "值為 Shift-Q。）"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:184
 msgid "Orthogonalize Shape"
 msgstr "形狀直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:50
 msgid "Move nodes so all angles are 90 or 180 degrees"
 msgstr "移動節點讓所有的角度為 90 或 180 度"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 msgid "Orthogonalize Shape / Undo"
 msgstr "形狀直角化 / 復原"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:83
 msgid "Undo orthogonalization for certain nodes"
 msgstr "復原某些節點的直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Orthogonalize / Undo"
 msgstr "直角化 / 復原"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:113
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1832,9 +1857,9 @@
 "請選擇被前一次形狀直角化動作所移動的節點！"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:115
 msgid "Undo Orthogonalize Shape"
 msgstr "復原形狀直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1845,22 +1870,22 @@
 "<br>改變您的投影法可以去除這項警告。<br>是否要繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:153
 msgid "Selection must consist only of ways and nodes."
 msgstr "選擇區域必須由路徑和節點組成。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
 msgid "Orthogonalize"
 msgstr "直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:190
 msgid "Usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:191
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "選取的元素不能直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:279
 msgid ""
 "<html>Please make sure all selected ways head in a similar direction<br>or "
@@ -1870,5 +1895,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:419
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:432
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr "請選擇角度大約為 90 或 180 度的路徑。"
@@ -1876,6 +1901,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
@@ -1990,5 +2015,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Redo"
 msgstr "重做"
@@ -2122,27 +2147,27 @@
 msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。"
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
 msgid "Show Status Report"
 msgstr "顯示狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "顯示有與程式錯誤相關資訊的狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
 #, java-format
 msgid "Help: {0}"
 msgstr "求助：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "複製到剪貼簿並關閉"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
@@ -2404,5 +2429,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2824,5 +2849,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -2982,8 +3007,8 @@
 "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
@@ -2998,9 +3023,9 @@
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 msgid "Select, move, scale and rotate objects"
 msgstr "選擇、移動、縮放和旋轉物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:405
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -3008,17 +3033,17 @@
 msgstr[0] "加入並移動虛擬新節點至{0}路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:755
 msgid "Move elements"
 msgstr "移動元素"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Move them"
 msgstr "移動它們"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Undo move"
 msgstr "取消移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:758
 #, java-format
 msgid ""
@@ -3030,22 +3055,22 @@
 "真的要移動它們嗎？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:918
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:920
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:922
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:924
 msgid "Release the mouse button to stop scaling."
 msgstr "放開滑鼠按鈕以停止縮放。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:926
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3200,93 +3225,74 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
-#, fuzzy
 msgid "Special targets"
-msgstr "<u>特殊的目標：</u>"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
-#, fuzzy
-msgid ""
-"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+msgid ""
+"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
 "<b>relation</b>)"
 msgstr ""
-"<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係"
-"(relation)</b>)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
-#, fuzzy
 msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>使用者：</b>... - 所有由某使用者改變的物件"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
-#, fuzzy
 msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 所有物件是由匿名使用者所改變的"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#, fuzzy
 msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - 以此為 ID 的物件 (0 為新的物件)"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#, fuzzy
 msgid ""
 "<b>version:</b>... - objects with given version (0 objects without an "
 "assigned version)"
-msgstr "<b>版本：</b>... - 查看這個版本的物件（未指定版本則為 0 個物件）"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
-#, fuzzy
 msgid ""
 "<b>changeset:</b>... - objects with given changeset id (0 objects without "
 "assigned changeset)"
 msgstr ""
-"<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物"
-"件）"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
-#, fuzzy
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
-"min-max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
+msgid ""
+"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
+"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
-#, fuzzy
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
-"max, nodes:min- or nodes:-max)"
-msgstr ""
-"<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
+msgid ""
+"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
+"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
-#, fuzzy
 msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>角色：</b>... - 在關係中指定角色的物件"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
-#, fuzzy
-msgid ""
-"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
-"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>時刻戳記：</b>... -  有此時刻戳記的物件 (<b>2009-11-12T14:51:09Z</b>，"
-"<b>2009-11-12</b> 或 <b>T14:51</b> ...)"
+msgid ""
+"<b>timestamp:</b>... - objects with this timestamp (2009-11-12T14:51:09Z, "
+"2009-11-12 or T14:51 ...)"
+msgstr ""
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
-"areasize:max)"
+"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
+"max or <b>areasize:</b>max)"
 msgstr ""
 
@@ -3608,5 +3614,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1710 build/trans_presets.java:3619
+#: build/trans_presets.java:1723 build/trans_presets.java:3632
 msgid "Other"
 msgstr "其他"
@@ -4326,5 +4332,5 @@
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
@@ -4335,5 +4341,5 @@
 #. ICON(data/)
 #. light cyan
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:14
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:64
@@ -4344,5 +4350,5 @@
 #. ICON(data/)
 #. dark blue
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
@@ -4355,10 +4361,10 @@
 #. only for display, no real type
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:15
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:18
 msgid "closedway"
 msgstr "封閉路徑"
 
 #. ICON(data/)
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:16
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:19
 msgid "multipolygon"
 msgstr "多重多邊形"
@@ -4895,5 +4901,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4272
 msgid "Multipolygon"
 msgstr "多重多邊形"
@@ -5231,5 +5237,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
@@ -5250,5 +5256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:624
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:253
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:191
 msgid "Please select the row to edit."
@@ -5256,5 +5262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:228
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
@@ -5378,7 +5384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
-#, fuzzy
 msgid "More than one \"via\" node found"
-msgstr "找到一個以上「via」路徑"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
@@ -5725,5 +5730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "railway"
 msgstr "鐵路"
@@ -5868,5 +5873,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 msgid "Imagery"
 msgstr "圖片"
@@ -5947,10 +5952,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:172
 msgid "Username"
 msgstr "使用者名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:180
 msgid "Password"
 msgstr "密碼"
@@ -6101,5 +6106,5 @@
 msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -6107,10 +6112,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "檢視"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6119,5 +6124,5 @@
 msgstr "工具"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6125,5 +6130,5 @@
 msgstr "預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6134,5 +6139,5 @@
 msgstr "選單：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
 msgid "Audio"
 msgstr "音效"
@@ -6941,5 +6946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:276
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
@@ -7067,5 +7072,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7321,6 +7326,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Download"
 msgstr "下載"
@@ -7388,14 +7393,14 @@
 msgstr "切換：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:308
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr "選擇用在這個指令中的物件（除非目前已被删除）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:369
 msgid "Undo the selected and all later commands"
 msgstr "取消選取以及之後所有的指令"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
 msgid "Redo the selected and all earlier commands"
 msgstr "重複選取動作以及之後所有的指令"
@@ -7647,7 +7652,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-#, fuzzy
 msgid "In conflict with:\n"
-msgstr "衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
@@ -7852,10 +7856,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:581 build/trans_presets.java:628
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:2362 build/trans_presets.java:2709
-#: build/trans_presets.java:2710 build/trans_presets.java:2711
+#: build/trans_presets.java:581 build/trans_presets.java:640
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:2375 build/trans_presets.java:2722
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -8056,5 +8060,5 @@
 #. item "Power/Power Generator" combo "Source"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
@@ -8100,5 +8104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4271
 msgid "Relations"
 msgstr "關係"
@@ -8237,5 +8241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:60
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62
 msgid "Selection"
 msgstr "選擇區域"
@@ -8870,5 +8874,4 @@
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Rental" text "Name"
-#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
@@ -9541,175 +9544,175 @@
 #: build/trans_presets.java:503 build/trans_presets.java:519
 #: build/trans_presets.java:535 build/trans_presets.java:561
-#: build/trans_presets.java:598 build/trans_presets.java:620
-#: build/trans_presets.java:645 build/trans_presets.java:669
-#: build/trans_presets.java:690 build/trans_presets.java:711
-#: build/trans_presets.java:731 build/trans_presets.java:741
-#: build/trans_presets.java:752 build/trans_presets.java:814
-#: build/trans_presets.java:832 build/trans_presets.java:841
-#: build/trans_presets.java:914 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1097 build/trans_presets.java:1108
-#: build/trans_presets.java:1117 build/trans_presets.java:1123
-#: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:598 build/trans_presets.java:632
+#: build/trans_presets.java:657 build/trans_presets.java:681
+#: build/trans_presets.java:702 build/trans_presets.java:723
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:764 build/trans_presets.java:826
+#: build/trans_presets.java:844 build/trans_presets.java:853
+#: build/trans_presets.java:926 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1101
+#: build/trans_presets.java:1109 build/trans_presets.java:1120
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1143 build/trans_presets.java:1150
 #: build/trans_presets.java:1164 build/trans_presets.java:1171
-#: build/trans_presets.java:1176 build/trans_presets.java:1182
-#: build/trans_presets.java:1189 build/trans_presets.java:1199
-#: build/trans_presets.java:1205 build/trans_presets.java:1211
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1239
-#: build/trans_presets.java:1246 build/trans_presets.java:1252
-#: build/trans_presets.java:1269 build/trans_presets.java:1276
-#: build/trans_presets.java:1283 build/trans_presets.java:1380
-#: build/trans_presets.java:1432 build/trans_presets.java:1446
-#: build/trans_presets.java:1457 build/trans_presets.java:1470
-#: build/trans_presets.java:1483 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1519
-#: build/trans_presets.java:1530 build/trans_presets.java:1541
-#: build/trans_presets.java:1551 build/trans_presets.java:1562
-#: build/trans_presets.java:1568 build/trans_presets.java:1578
-#: build/trans_presets.java:1599 build/trans_presets.java:1631
-#: build/trans_presets.java:1641 build/trans_presets.java:1647
-#: build/trans_presets.java:1655 build/trans_presets.java:1671
-#: build/trans_presets.java:1680 build/trans_presets.java:1690
-#: build/trans_presets.java:1699 build/trans_presets.java:1723
-#: build/trans_presets.java:1731 build/trans_presets.java:1745
-#: build/trans_presets.java:1756 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:1796
-#: build/trans_presets.java:1808 build/trans_presets.java:1819
-#: build/trans_presets.java:1839 build/trans_presets.java:1854
-#: build/trans_presets.java:1862 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1954
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2005 build/trans_presets.java:2022
-#: build/trans_presets.java:2040 build/trans_presets.java:2062
-#: build/trans_presets.java:2081 build/trans_presets.java:2102
-#: build/trans_presets.java:2121 build/trans_presets.java:2138
-#: build/trans_presets.java:2157 build/trans_presets.java:2175
-#: build/trans_presets.java:2192 build/trans_presets.java:2209
-#: build/trans_presets.java:2225 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2247
-#: build/trans_presets.java:2264 build/trans_presets.java:2272
-#: build/trans_presets.java:2287 build/trans_presets.java:2297
-#: build/trans_presets.java:2309 build/trans_presets.java:2319
-#: build/trans_presets.java:2326 build/trans_presets.java:2335
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2359 build/trans_presets.java:2369
-#: build/trans_presets.java:2374 build/trans_presets.java:2382
-#: build/trans_presets.java:2389 build/trans_presets.java:2397
-#: build/trans_presets.java:2406 build/trans_presets.java:2413
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2434 build/trans_presets.java:2445
-#: build/trans_presets.java:2457 build/trans_presets.java:2463
-#: build/trans_presets.java:2470 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2546
-#: build/trans_presets.java:2556 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2583 build/trans_presets.java:2591
-#: build/trans_presets.java:2623 build/trans_presets.java:2701
-#: build/trans_presets.java:2719 build/trans_presets.java:2729
-#: build/trans_presets.java:2744 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2771
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2879 build/trans_presets.java:2888
-#: build/trans_presets.java:2896 build/trans_presets.java:2902
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2952
-#: build/trans_presets.java:2961 build/trans_presets.java:2968
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2998 build/trans_presets.java:3004
-#: build/trans_presets.java:3010 build/trans_presets.java:3016
-#: build/trans_presets.java:3022 build/trans_presets.java:3028
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1188 build/trans_presets.java:1194
+#: build/trans_presets.java:1201 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1223
+#: build/trans_presets.java:1228 build/trans_presets.java:1234
+#: build/trans_presets.java:1242 build/trans_presets.java:1251
+#: build/trans_presets.java:1258 build/trans_presets.java:1264
+#: build/trans_presets.java:1281 build/trans_presets.java:1288
+#: build/trans_presets.java:1295 build/trans_presets.java:1392
+#: build/trans_presets.java:1444 build/trans_presets.java:1458
+#: build/trans_presets.java:1469 build/trans_presets.java:1482
+#: build/trans_presets.java:1495 build/trans_presets.java:1509
+#: build/trans_presets.java:1520 build/trans_presets.java:1531
+#: build/trans_presets.java:1542 build/trans_presets.java:1553
+#: build/trans_presets.java:1563 build/trans_presets.java:1574
+#: build/trans_presets.java:1580 build/trans_presets.java:1590
+#: build/trans_presets.java:1611 build/trans_presets.java:1643
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1683
+#: build/trans_presets.java:1694 build/trans_presets.java:1703
+#: build/trans_presets.java:1712 build/trans_presets.java:1736
+#: build/trans_presets.java:1744 build/trans_presets.java:1758
+#: build/trans_presets.java:1769 build/trans_presets.java:1779
+#: build/trans_presets.java:1789 build/trans_presets.java:1809
+#: build/trans_presets.java:1821 build/trans_presets.java:1832
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:1875 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1967
+#: build/trans_presets.java:1984 build/trans_presets.java:2001
+#: build/trans_presets.java:2018 build/trans_presets.java:2035
+#: build/trans_presets.java:2053 build/trans_presets.java:2075
+#: build/trans_presets.java:2094 build/trans_presets.java:2115
+#: build/trans_presets.java:2134 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2188
+#: build/trans_presets.java:2205 build/trans_presets.java:2222
+#: build/trans_presets.java:2238 build/trans_presets.java:2245
+#: build/trans_presets.java:2253 build/trans_presets.java:2260
+#: build/trans_presets.java:2277 build/trans_presets.java:2285
+#: build/trans_presets.java:2300 build/trans_presets.java:2310
+#: build/trans_presets.java:2322 build/trans_presets.java:2332
+#: build/trans_presets.java:2339 build/trans_presets.java:2348
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2372 build/trans_presets.java:2382
+#: build/trans_presets.java:2387 build/trans_presets.java:2395
+#: build/trans_presets.java:2402 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2426
+#: build/trans_presets.java:2433 build/trans_presets.java:2439
+#: build/trans_presets.java:2447 build/trans_presets.java:2458
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2491
+#: build/trans_presets.java:2498 build/trans_presets.java:2505
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2526 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2552 build/trans_presets.java:2559
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
+#: build/trans_presets.java:2596 build/trans_presets.java:2604
+#: build/trans_presets.java:2636 build/trans_presets.java:2714
+#: build/trans_presets.java:2732 build/trans_presets.java:2742
+#: build/trans_presets.java:2757 build/trans_presets.java:2766
+#: build/trans_presets.java:2775 build/trans_presets.java:2784
+#: build/trans_presets.java:2793 build/trans_presets.java:2799
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2892 build/trans_presets.java:2901
+#: build/trans_presets.java:2909 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2933 build/trans_presets.java:2939
+#: build/trans_presets.java:2945 build/trans_presets.java:2951
+#: build/trans_presets.java:2957 build/trans_presets.java:2965
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3017
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3041
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
 #: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3080 build/trans_presets.java:3095
-#: build/trans_presets.java:3102 build/trans_presets.java:3110
-#: build/trans_presets.java:3115 build/trans_presets.java:3130
-#: build/trans_presets.java:3137 build/trans_presets.java:3149
-#: build/trans_presets.java:3159 build/trans_presets.java:3166
-#: build/trans_presets.java:3175 build/trans_presets.java:3182
-#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3074 build/trans_presets.java:3080
+#: build/trans_presets.java:3093 build/trans_presets.java:3108
+#: build/trans_presets.java:3115 build/trans_presets.java:3123
+#: build/trans_presets.java:3128 build/trans_presets.java:3143
+#: build/trans_presets.java:3150 build/trans_presets.java:3162
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3188 build/trans_presets.java:3195
 #: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3222 build/trans_presets.java:3232
-#: build/trans_presets.java:3238 build/trans_presets.java:3249
-#: build/trans_presets.java:3269 build/trans_presets.java:3325
-#: build/trans_presets.java:3331 build/trans_presets.java:3339
-#: build/trans_presets.java:3346 build/trans_presets.java:3352
-#: build/trans_presets.java:3358 build/trans_presets.java:3364
-#: build/trans_presets.java:3369 build/trans_presets.java:3374
-#: build/trans_presets.java:3379 build/trans_presets.java:3388
-#: build/trans_presets.java:3395 build/trans_presets.java:3402
-#: build/trans_presets.java:3410 build/trans_presets.java:3417
-#: build/trans_presets.java:3425 build/trans_presets.java:3434
-#: build/trans_presets.java:3442 build/trans_presets.java:3451
-#: build/trans_presets.java:3460 build/trans_presets.java:3467
-#: build/trans_presets.java:3475 build/trans_presets.java:3481
-#: build/trans_presets.java:3489 build/trans_presets.java:3497
-#: build/trans_presets.java:3504 build/trans_presets.java:3511
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3538
-#: build/trans_presets.java:3546 build/trans_presets.java:3555
-#: build/trans_presets.java:3561 build/trans_presets.java:3569
-#: build/trans_presets.java:3578 build/trans_presets.java:3585
-#: build/trans_presets.java:3591 build/trans_presets.java:3600
-#: build/trans_presets.java:3609 build/trans_presets.java:3625
-#: build/trans_presets.java:3634 build/trans_presets.java:3642
-#: build/trans_presets.java:3648 build/trans_presets.java:3654
-#: build/trans_presets.java:3662 build/trans_presets.java:3671
-#: build/trans_presets.java:3680 build/trans_presets.java:3687
-#: build/trans_presets.java:3695 build/trans_presets.java:3702
-#: build/trans_presets.java:3710 build/trans_presets.java:3718
-#: build/trans_presets.java:3726 build/trans_presets.java:3735
-#: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3760 build/trans_presets.java:3767
-#: build/trans_presets.java:3774 build/trans_presets.java:3782
-#: build/trans_presets.java:3789 build/trans_presets.java:3797
-#: build/trans_presets.java:3824 build/trans_presets.java:3830
-#: build/trans_presets.java:3836 build/trans_presets.java:3842
-#: build/trans_presets.java:3848 build/trans_presets.java:3856
-#: build/trans_presets.java:3863 build/trans_presets.java:3870
-#: build/trans_presets.java:3877 build/trans_presets.java:3884
-#: build/trans_presets.java:3892 build/trans_presets.java:3900
-#: build/trans_presets.java:3908 build/trans_presets.java:3915
-#: build/trans_presets.java:3922 build/trans_presets.java:3929
-#: build/trans_presets.java:3938 build/trans_presets.java:3947
-#: build/trans_presets.java:3955 build/trans_presets.java:3963
-#: build/trans_presets.java:3971 build/trans_presets.java:3980
-#: build/trans_presets.java:3988 build/trans_presets.java:3998
-#: build/trans_presets.java:4008 build/trans_presets.java:4017
-#: build/trans_presets.java:4023 build/trans_presets.java:4029
-#: build/trans_presets.java:4035 build/trans_presets.java:4040
-#: build/trans_presets.java:4046 build/trans_presets.java:4056
-#: build/trans_presets.java:4062 build/trans_presets.java:4068
-#: build/trans_presets.java:4074 build/trans_presets.java:4081
-#: build/trans_presets.java:4088 build/trans_presets.java:4094
-#: build/trans_presets.java:4100 build/trans_presets.java:4107
-#: build/trans_presets.java:4113 build/trans_presets.java:4118
-#: build/trans_presets.java:4125 build/trans_presets.java:4132
-#: build/trans_presets.java:4138 build/trans_presets.java:4147
-#: build/trans_presets.java:4155 build/trans_presets.java:4161
-#: build/trans_presets.java:4167 build/trans_presets.java:4174
-#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:3215 build/trans_presets.java:3221
+#: build/trans_presets.java:3235 build/trans_presets.java:3245
+#: build/trans_presets.java:3251 build/trans_presets.java:3262
+#: build/trans_presets.java:3282 build/trans_presets.java:3338
+#: build/trans_presets.java:3344 build/trans_presets.java:3352
+#: build/trans_presets.java:3359 build/trans_presets.java:3365
+#: build/trans_presets.java:3371 build/trans_presets.java:3377
+#: build/trans_presets.java:3382 build/trans_presets.java:3387
+#: build/trans_presets.java:3392 build/trans_presets.java:3401
+#: build/trans_presets.java:3408 build/trans_presets.java:3415
+#: build/trans_presets.java:3423 build/trans_presets.java:3430
+#: build/trans_presets.java:3438 build/trans_presets.java:3447
+#: build/trans_presets.java:3455 build/trans_presets.java:3464
+#: build/trans_presets.java:3473 build/trans_presets.java:3480
+#: build/trans_presets.java:3488 build/trans_presets.java:3494
+#: build/trans_presets.java:3502 build/trans_presets.java:3510
+#: build/trans_presets.java:3517 build/trans_presets.java:3524
+#: build/trans_presets.java:3530 build/trans_presets.java:3538
+#: build/trans_presets.java:3545 build/trans_presets.java:3551
+#: build/trans_presets.java:3559 build/trans_presets.java:3568
+#: build/trans_presets.java:3574 build/trans_presets.java:3582
+#: build/trans_presets.java:3591 build/trans_presets.java:3598
+#: build/trans_presets.java:3604 build/trans_presets.java:3613
+#: build/trans_presets.java:3622 build/trans_presets.java:3638
+#: build/trans_presets.java:3647 build/trans_presets.java:3655
+#: build/trans_presets.java:3661 build/trans_presets.java:3667
+#: build/trans_presets.java:3675 build/trans_presets.java:3684
+#: build/trans_presets.java:3693 build/trans_presets.java:3700
+#: build/trans_presets.java:3708 build/trans_presets.java:3715
+#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:3739 build/trans_presets.java:3748
+#: build/trans_presets.java:3757 build/trans_presets.java:3765
+#: build/trans_presets.java:3773 build/trans_presets.java:3780
+#: build/trans_presets.java:3787 build/trans_presets.java:3795
+#: build/trans_presets.java:3802 build/trans_presets.java:3810
+#: build/trans_presets.java:3837 build/trans_presets.java:3843
+#: build/trans_presets.java:3849 build/trans_presets.java:3855
+#: build/trans_presets.java:3861 build/trans_presets.java:3869
+#: build/trans_presets.java:3876 build/trans_presets.java:3883
+#: build/trans_presets.java:3890 build/trans_presets.java:3897
+#: build/trans_presets.java:3905 build/trans_presets.java:3913
+#: build/trans_presets.java:3921 build/trans_presets.java:3928
+#: build/trans_presets.java:3935 build/trans_presets.java:3942
+#: build/trans_presets.java:3951 build/trans_presets.java:3960
+#: build/trans_presets.java:3968 build/trans_presets.java:3976
+#: build/trans_presets.java:3984 build/trans_presets.java:3993
+#: build/trans_presets.java:4001 build/trans_presets.java:4011
+#: build/trans_presets.java:4021 build/trans_presets.java:4030
+#: build/trans_presets.java:4036 build/trans_presets.java:4042
+#: build/trans_presets.java:4048 build/trans_presets.java:4053
+#: build/trans_presets.java:4059 build/trans_presets.java:4069
+#: build/trans_presets.java:4075 build/trans_presets.java:4081
+#: build/trans_presets.java:4087 build/trans_presets.java:4094
+#: build/trans_presets.java:4101 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4120
+#: build/trans_presets.java:4126 build/trans_presets.java:4131
+#: build/trans_presets.java:4138 build/trans_presets.java:4145
+#: build/trans_presets.java:4151 build/trans_presets.java:4160
+#: build/trans_presets.java:4168 build/trans_presets.java:4174
+#: build/trans_presets.java:4180 build/trans_presets.java:4187
 #: build/trans_presets.java:4195 build/trans_presets.java:4201
-#: build/trans_presets.java:4207 build/trans_presets.java:4213
-#: build/trans_presets.java:4219 build/trans_presets.java:4266
-#: build/trans_presets.java:4280 build/trans_presets.java:4299
-#: build/trans_presets.java:4318 build/trans_presets.java:4348
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4208 build/trans_presets.java:4214
+#: build/trans_presets.java:4220 build/trans_presets.java:4226
+#: build/trans_presets.java:4232 build/trans_presets.java:4279
+#: build/trans_presets.java:4293 build/trans_presets.java:4312
+#: build/trans_presets.java:4331 build/trans_presets.java:4361
+#: build/trans_presets.java:4386
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -10247,5 +10250,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgid "Position"
 msgstr "位置"
@@ -10831,25 +10834,25 @@
 msgstr "重新命名目前選取的書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "min lon"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
 msgid "max lon"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "Clear textarea"
 msgstr "清除文字區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -10857,57 +10860,57 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
 msgid "Bounding Box"
 msgstr "綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
 msgstr "字串「{0}」不是一個合格的 double 數值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161
 msgid "Value for latitude in range [-90,90] required."
 msgstr "緯度的數值範圍必須為 [-90,90]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201
 msgid "Value for longitude in range [-180,180] required."
 msgstr "經度的數值範圍必須為 [-180,180]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232
 msgid "Paste URL from clipboard"
 msgstr "從剪貼簿貼上 URL"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
 msgstr "資料來源和類型："
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
 msgid "Select to download OSM data in the selected download area."
 msgstr "選擇以下載選取下載區域中的 OSM 資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
 msgid "Raw GPS data"
 msgstr "原始 GPS 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download GPS traces in the selected download area."
 msgstr "選擇以下載選取下載區域中的 GPS 軌跡。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:127
 msgid "Download as new layer"
 msgstr "下載為新圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:128
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
@@ -10917,29 +10920,29 @@
 "層。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:200
 msgid "No area selected yet"
 msgstr "尚未選取區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:203
 msgid "Download area too large; will probably be rejected by server"
 msgstr "下載區域太大；可能會被伺服器拒絕"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
 msgid "Download area ok, size probably acceptable to server"
 msgstr "下載區域確定，大小應該會被伺服器接受"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:359
 msgid "Click to close the dialog and to abort downloading"
 msgstr "點選以關閉此對話盒並放棄下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
 msgid "Click to download the currently selected area"
 msgstr "點選以下載目前選取的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:383
 msgid "Please select a download area first."
 msgstr "請先選擇下載區域。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
 #, java-format
 msgid ""
@@ -11028,12 +11031,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: build/specialmessages.java:84 build/trans_presets.java:480
-#: build/trans_presets.java:787 build/trans_presets.java:796
-#: build/trans_presets.java:1200 build/trans_presets.java:1580
-#: build/trans_presets.java:1692 build/trans_presets.java:2447
-#: build/trans_presets.java:2682 build/trans_presets.java:2726
-#: build/trans_presets.java:2954 build/trans_presets.java:2963
-#: build/trans_presets.java:3123 build/trans_presets.java:3239
-#: build/trans_presets.java:3999 build/trans_presets.java:4009
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:799 build/trans_presets.java:808
+#: build/trans_presets.java:1212 build/trans_presets.java:1592
+#: build/trans_presets.java:1705 build/trans_presets.java:2460
+#: build/trans_presets.java:2695 build/trans_presets.java:2739
+#: build/trans_presets.java:2967 build/trans_presets.java:2976
+#: build/trans_presets.java:3136 build/trans_presets.java:3252
+#: build/trans_presets.java:4012 build/trans_presets.java:4022
+#: build/trans_presets.java:4031
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -11537,5 +11540,5 @@
 msgstr "正在關閉變更組合 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:103
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
@@ -11543,21 +11546,21 @@
 msgstr "警告：無法將憑證對話盒永遠置於最上層。抓到安全性例外。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:109
 msgid "Enter credentials for OSM API"
 msgstr "輸入 OSM API 的憑證"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:116
 msgid "Enter credentials for HTTP proxy"
 msgstr "輸入 HTTP 代理伺服器所需憑證"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the user name of your OSM account"
 msgstr "請輸入您 OSM 帳號的使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:246
 msgid "Please enter the password of your OSM account"
 msgstr "請輸入您 OSM 帳號的密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:248
 #, java-format
 msgid ""
@@ -11566,17 +11569,17 @@
 msgstr "在 OSM API「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:250
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告：密碼是以未加密的方式傳輸。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr "請輸入您的代理伺服器驗證用的使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:264
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr "請輸入您的代理伺服器驗證用的密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:266
 #, java-format
 msgid ""
@@ -11587,5 +11590,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:268
 msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
@@ -11595,13 +11598,13 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate"
 msgstr "驗證"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:335
 msgid "Authenticate with the supplied username and password"
 msgstr "以指定的使用者名稱和密碼進行驗證"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:349
 msgid "Cancel authentication"
 msgstr "取消驗證"
@@ -11885,10 +11888,10 @@
 #: build/trans_presets.java:504 build/trans_presets.java:520
 #: build/trans_presets.java:545 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:629
-#: build/trans_presets.java:653 build/trans_presets.java:678
-#: build/trans_presets.java:698 build/trans_presets.java:719
-#: build/trans_presets.java:1074 build/trans_presets.java:1082
-#: build/trans_presets.java:1090 build/trans_presets.java:1098
-#: build/trans_presets.java:1109 build/trans_presets.java:1386
+#: build/trans_presets.java:606 build/trans_presets.java:641
+#: build/trans_presets.java:665 build/trans_presets.java:690
+#: build/trans_presets.java:710 build/trans_presets.java:731
+#: build/trans_presets.java:1086 build/trans_presets.java:1094
+#: build/trans_presets.java:1102 build/trans_presets.java:1110
+#: build/trans_presets.java:1121 build/trans_presets.java:1398
 msgid "Layer"
 msgstr "層級"
@@ -12384,5 +12387,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
-#: build/trans_presets.java:4321 build/trans_presets.java:4351
+#: build/trans_presets.java:4334 build/trans_presets.java:4364
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -14202,13 +14205,13 @@
 msgstr "預設數值目前不明（設定值尚未使用）。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:241
 msgid "Enter a new key/value pair"
 msgstr "輸入新的設定鍵/數值配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:263
 msgid "Change a key/value pair"
 msgstr "改變設定鍵/數值配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:281
 msgid "Values"
 msgstr "數值"
@@ -14581,5 +14584,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1584
 msgid "Car"
 msgstr "汽車"
@@ -14606,13 +14609,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:452 build/trans_presets.java:579
-#: build/trans_presets.java:858 build/trans_presets.java:868
-#: build/trans_presets.java:877 build/trans_presets.java:889
-#: build/trans_presets.java:903 build/trans_presets.java:925
-#: build/trans_presets.java:968 build/trans_presets.java:981
-#: build/trans_presets.java:993 build/trans_presets.java:1005
-#: build/trans_presets.java:1017 build/trans_presets.java:1029
-#: build/trans_presets.java:1039 build/trans_presets.java:1048
-#: build/trans_presets.java:1057 build/trans_presets.java:1718
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:870 build/trans_presets.java:880
+#: build/trans_presets.java:889 build/trans_presets.java:901
+#: build/trans_presets.java:915 build/trans_presets.java:937
+#: build/trans_presets.java:980 build/trans_presets.java:993
+#: build/trans_presets.java:1005 build/trans_presets.java:1017
+#: build/trans_presets.java:1029 build/trans_presets.java:1041
+#: build/trans_presets.java:1051 build/trans_presets.java:1060
+#: build/trans_presets.java:1069 build/trans_presets.java:1731
+#: build/trans_presets.java:1811
 msgid "Bicycle"
 msgstr "單車"
@@ -14652,12 +14655,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:448 build/trans_presets.java:578
-#: build/trans_presets.java:857 build/trans_presets.java:867
-#: build/trans_presets.java:876 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:967 build/trans_presets.java:980
-#: build/trans_presets.java:992 build/trans_presets.java:1004
-#: build/trans_presets.java:1016 build/trans_presets.java:1028
-#: build/trans_presets.java:1038 build/trans_presets.java:1047
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:869 build/trans_presets.java:879
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:914 build/trans_presets.java:936
+#: build/trans_presets.java:979 build/trans_presets.java:992
+#: build/trans_presets.java:1004 build/trans_presets.java:1016
+#: build/trans_presets.java:1028 build/trans_presets.java:1040
+#: build/trans_presets.java:1050 build/trans_presets.java:1059
+#: build/trans_presets.java:1068
 msgid "Foot"
 msgstr "步行"
@@ -16273,21 +16276,21 @@
 msgstr "搜尋標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:68
 msgid "Min. latitude"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:70
 msgid "Min. longitude"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:72
 msgid "Max. latitude"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:74
 msgid "Max. longitude"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:84
 msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
@@ -17046,5 +17049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
 msgid "OSM Server Files"
 msgstr "OSM 伺服器檔案"
@@ -17076,9 +17079,18 @@
 msgstr "正在分析 OSM 歷史紀錄資料 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java:40
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr "檔案「{0}」不存在"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+#, java-format
+msgid "No data found in file {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+msgid "Open OSM file"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
@@ -17164,5 +17176,5 @@
 msgstr "標籤中缺少設定鍵或數值屬性。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
@@ -17171,5 +17183,5 @@
 msgstr "在輸入串流中發現未定義的元素「{0}」。正在略過。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
@@ -17177,6 +17189,6 @@
 msgstr "不合法的物件，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -17189,8 +17201,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
@@ -17206,5 +17218,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
@@ -17212,5 +17224,5 @@
 msgstr "不明或不支援的 API 版本。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
@@ -17219,6 +17231,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
@@ -17232,6 +17244,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
@@ -17242,5 +17254,5 @@
 msgstr "屬性「changeset」有不合格的數值。得到「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
@@ -17249,5 +17261,5 @@
 msgstr "缺少必要的屬性「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
@@ -17256,5 +17268,5 @@
 msgstr "屬性「{0}」有不合格的 long 數值。得到「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
 #, java-format
@@ -17263,5 +17275,5 @@
 msgstr "外部 ID「{0}」的路徑包含了缺少的外部 ID「{1}」的節點。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
 #, java-format
@@ -17269,5 +17281,5 @@
 msgstr "刪除的節點 {0} 是路徑 {1} 的一部分"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
 #, java-format
@@ -17279,5 +17291,5 @@
 "了。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
 #, java-format
@@ -17287,5 +17299,5 @@
 msgstr "外部 id「{0}」的關係包含了缺少的外部 id「{1}」的原型。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
 #, java-format
@@ -17293,17 +17305,17 @@
 msgstr "刪除的成員 {0} 正由關係 {1} 使用"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
 msgid "Parsing OSM data..."
 msgstr "正在分析 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
 msgid "Preparing data set..."
 msgstr "正在準備資料組合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
@@ -18014,13 +18026,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:73
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Report Bug"
 msgstr "回報程式錯誤"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -18031,9 +18043,9 @@
 "請考慮不吝回報錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "Unexpected Exception"
 msgstr "未預期的例外"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:114
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:109
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -18042,5 +18054,5 @@
 "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:118
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:113
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -18050,5 +18062,5 @@
 "錯誤："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -18059,5 +18071,5 @@
 "一些。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -18065,9 +18077,9 @@
 msgstr "另外，如果這些都不行您也可以在這個 URL 自行填寫資訊："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "（該文字已複製到您的剪貼簿中。）"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:139
 msgid "You have encountered a bug in JOSM"
 msgstr "您遇到了 JOSM 的程式錯誤"
@@ -18321,5 +18333,5 @@
 "<br><br>錯誤的訊息為：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -19153,7 +19165,6 @@
 #. Plugin multipoly-convert
 #: build/trans_plugins.java:83
-#, fuzzy
 msgid "Simply convert an area to a multipolygon."
-msgstr "轉換為多重多邊形。"
+msgstr ""
 
 #. Plugin namemanager
@@ -19568,9 +19579,9 @@
 #: build/trans_presets.java:173 build/trans_presets.java:194
 #: build/trans_presets.java:236 build/trans_presets.java:258
-#: build/trans_presets.java:1875 build/trans_presets.java:1883
-#: build/trans_presets.java:1891 build/trans_presets.java:1925
-#: build/trans_presets.java:2730 build/trans_presets.java:3271
-#: build/trans_presets.java:3287 build/trans_presets.java:4319
-#: build/trans_presets.java:4349
+#: build/trans_presets.java:1888 build/trans_presets.java:1896
+#: build/trans_presets.java:1904 build/trans_presets.java:1938
+#: build/trans_presets.java:2743 build/trans_presets.java:3284
+#: build/trans_presets.java:3300 build/trans_presets.java:4332
+#: build/trans_presets.java:4362
 msgid "Reference"
 msgstr "道路編號"
@@ -19624,5 +19635,5 @@
 #: build/trans_presets.java:505 build/trans_presets.java:521
 #: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1400
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -19656,4 +19667,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Cycle Lane" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
@@ -19672,6 +19684,7 @@
 #: build/trans_presets.java:544 build/trans_presets.java:577
 #: build/trans_presets.java:600 build/trans_presets.java:622
-#: build/trans_presets.java:647 build/trans_presets.java:671
-#: build/trans_presets.java:713 build/trans_presets.java:1381
+#: build/trans_presets.java:634 build/trans_presets.java:659
+#: build/trans_presets.java:683 build/trans_presets.java:725
+#: build/trans_presets.java:1393
 msgid "Oneway"
 msgstr "單行道"
@@ -19722,8 +19735,8 @@
 #: build/trans_presets.java:494 build/trans_presets.java:501
 #: build/trans_presets.java:539 build/trans_presets.java:572
-#: build/trans_presets.java:601 build/trans_presets.java:623
-#: build/trans_presets.java:648 build/trans_presets.java:672
-#: build/trans_presets.java:692 build/trans_presets.java:714
-#: build/trans_presets.java:1382 build/trans_surveyor.java:12
+#: build/trans_presets.java:601 build/trans_presets.java:635
+#: build/trans_presets.java:660 build/trans_presets.java:684
+#: build/trans_presets.java:704 build/trans_presets.java:726
+#: build/trans_presets.java:1394 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -19766,7 +19779,7 @@
 #: build/trans_presets.java:511 build/trans_presets.java:540
 #: build/trans_presets.java:573 build/trans_presets.java:602
-#: build/trans_presets.java:624 build/trans_presets.java:649
-#: build/trans_presets.java:673 build/trans_presets.java:693
-#: build/trans_presets.java:715 build/trans_presets.java:1383
+#: build/trans_presets.java:636 build/trans_presets.java:661
+#: build/trans_presets.java:685 build/trans_presets.java:705
+#: build/trans_presets.java:727 build/trans_presets.java:1395
 msgid "Tunnel"
 msgstr "隧道"
@@ -19806,8 +19819,8 @@
 #: build/trans_presets.java:427 build/trans_presets.java:486
 #: build/trans_presets.java:541 build/trans_presets.java:574
-#: build/trans_presets.java:603 build/trans_presets.java:625
-#: build/trans_presets.java:650 build/trans_presets.java:674
-#: build/trans_presets.java:694 build/trans_presets.java:716
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:603 build/trans_presets.java:637
+#: build/trans_presets.java:662 build/trans_presets.java:686
+#: build/trans_presets.java:706 build/trans_presets.java:728
+#: build/trans_presets.java:1396
 msgid "Cutting"
 msgstr "斷開"
@@ -19847,8 +19860,8 @@
 #: build/trans_presets.java:428 build/trans_presets.java:487
 #: build/trans_presets.java:542 build/trans_presets.java:575
-#: build/trans_presets.java:604 build/trans_presets.java:626
-#: build/trans_presets.java:651 build/trans_presets.java:675
-#: build/trans_presets.java:695 build/trans_presets.java:717
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:604 build/trans_presets.java:638
+#: build/trans_presets.java:663 build/trans_presets.java:687
+#: build/trans_presets.java:707 build/trans_presets.java:729
+#: build/trans_presets.java:1397
 msgid "Embankment"
 msgstr "堤防"
@@ -19888,8 +19901,8 @@
 #: build/trans_presets.java:408 build/trans_presets.java:429
 #: build/trans_presets.java:543 build/trans_presets.java:576
-#: build/trans_presets.java:605 build/trans_presets.java:627
-#: build/trans_presets.java:652 build/trans_presets.java:676
-#: build/trans_presets.java:696 build/trans_presets.java:718
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:605 build/trans_presets.java:639
+#: build/trans_presets.java:664 build/trans_presets.java:688
+#: build/trans_presets.java:708 build/trans_presets.java:730
+#: build/trans_presets.java:2352
 msgid "Lit"
 msgstr ""
@@ -19991,7 +20004,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "Incline"
 msgstr "坡"
@@ -20027,7 +20040,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10%"
 msgstr ""
@@ -20063,7 +20076,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10%"
 msgstr ""
@@ -20099,7 +20112,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "10°"
 msgstr ""
@@ -20135,7 +20148,7 @@
 #: build/trans_presets.java:508 build/trans_presets.java:523
 #: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:631
-#: build/trans_presets.java:655 build/trans_presets.java:680
-#: build/trans_presets.java:700 build/trans_presets.java:1390
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:667 build/trans_presets.java:692
+#: build/trans_presets.java:712 build/trans_presets.java:1402
 msgid "-10°"
 msgstr ""
@@ -20208,5 +20221,5 @@
 #. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:288 build/trans_presets.java:373
-#: build/trans_presets.java:677 build/trans_presets.java:697
+#: build/trans_presets.java:689 build/trans_presets.java:709
 msgid "Passing Places"
 msgstr ""
@@ -20239,9 +20252,9 @@
 #: build/trans_presets.java:507 build/trans_presets.java:522
 #: build/trans_presets.java:550 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:630
-#: build/trans_presets.java:654 build/trans_presets.java:679
-#: build/trans_presets.java:699 build/trans_presets.java:720
-#: build/trans_presets.java:1389 build/trans_presets.java:1786
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:608 build/trans_presets.java:642
+#: build/trans_presets.java:666 build/trans_presets.java:691
+#: build/trans_presets.java:711 build/trans_presets.java:732
+#: build/trans_presets.java:1401 build/trans_presets.java:1799
+#: build/trans_presets.java:1844
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -20285,7 +20298,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "Surface"
 msgstr "路面"
@@ -20312,7 +20325,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "paved"
 msgstr "有鋪面的"
@@ -20337,8 +20350,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "unpaved"
 msgstr "沒鋪面的"
@@ -20363,8 +20376,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "asphalt"
 msgstr "柏油"
@@ -20391,7 +20404,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "concrete"
 msgstr "水泥地"
@@ -20417,8 +20430,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2707
 msgid "metal"
 msgstr "金屬"
@@ -20445,9 +20458,9 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387 build/trans_presets.java:2384
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399 build/trans_presets.java:2397
+#: build/trans_presets.java:2707
 msgid "wood"
 msgstr "木頭"
@@ -20472,8 +20485,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "paving_stones"
 msgstr "鋪路石"
@@ -20500,7 +20513,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "cobblestone"
 msgstr "石子路"
@@ -20527,7 +20540,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "gravel"
 msgstr "碎石路"
@@ -20552,8 +20565,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "pebblestone"
 msgstr "鵝卵石"
@@ -20578,8 +20591,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "compacted"
 msgstr "壓實的"
@@ -20604,8 +20617,8 @@
 #: build/trans_presets.java:391 build/trans_presets.java:410
 #: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:621
-#: build/trans_presets.java:646 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:712
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:599 build/trans_presets.java:633
+#: build/trans_presets.java:658 build/trans_presets.java:682
+#: build/trans_presets.java:703 build/trans_presets.java:724
+#: build/trans_presets.java:1399
 msgid "grass_paver"
 msgstr "草地_鋪面"
@@ -20632,7 +20645,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "grass"
 msgstr "草地"
@@ -20659,7 +20672,7 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
 msgid "sand"
 msgstr "沙地"
@@ -20687,8 +20700,8 @@
 #: build/trans_presets.java:431 build/trans_presets.java:537
 #: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:621 build/trans_presets.java:646
-#: build/trans_presets.java:670 build/trans_presets.java:691
-#: build/trans_presets.java:712 build/trans_presets.java:1387
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:633 build/trans_presets.java:658
+#: build/trans_presets.java:682 build/trans_presets.java:703
+#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:2676
 msgid "ground"
 msgstr "地面"
@@ -20996,59 +21009,59 @@
 #: build/trans_presets.java:580 build/trans_presets.java:581
 #: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:628
-#: build/trans_presets.java:796 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1585 build/trans_presets.java:1586
-#: build/trans_presets.java:1587 build/trans_presets.java:1602
-#: build/trans_presets.java:1693 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1707
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
-#: build/trans_presets.java:1820 build/trans_presets.java:1821
-#: build/trans_presets.java:1822 build/trans_presets.java:1940
-#: build/trans_presets.java:1941 build/trans_presets.java:1942
-#: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:1959 build/trans_presets.java:1960
-#: build/trans_presets.java:1961 build/trans_presets.java:1974
-#: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1991
-#: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:1994 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2026
-#: build/trans_presets.java:2027 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2043
-#: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2049
-#: build/trans_presets.java:2065 build/trans_presets.java:2066
-#: build/trans_presets.java:2067 build/trans_presets.java:2068
-#: build/trans_presets.java:2088 build/trans_presets.java:2089
-#: build/trans_presets.java:2090 build/trans_presets.java:2091
-#: build/trans_presets.java:2107 build/trans_presets.java:2108
-#: build/trans_presets.java:2109 build/trans_presets.java:2110
-#: build/trans_presets.java:2124 build/trans_presets.java:2125
-#: build/trans_presets.java:2126 build/trans_presets.java:2127
-#: build/trans_presets.java:2143 build/trans_presets.java:2144
-#: build/trans_presets.java:2145 build/trans_presets.java:2146
-#: build/trans_presets.java:2162 build/trans_presets.java:2163
-#: build/trans_presets.java:2164 build/trans_presets.java:2165
-#: build/trans_presets.java:2178 build/trans_presets.java:2179
-#: build/trans_presets.java:2180 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2196
-#: build/trans_presets.java:2197 build/trans_presets.java:2198
-#: build/trans_presets.java:2212 build/trans_presets.java:2213
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2362 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:584 build/trans_presets.java:640
+#: build/trans_presets.java:808 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1593 build/trans_presets.java:1594
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:1599 build/trans_presets.java:1614
+#: build/trans_presets.java:1706 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1833 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1953
+#: build/trans_presets.java:1954 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1971
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1974 build/trans_presets.java:1987
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:2004
+#: build/trans_presets.java:2005 build/trans_presets.java:2006
+#: build/trans_presets.java:2007 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2039
+#: build/trans_presets.java:2040 build/trans_presets.java:2041
+#: build/trans_presets.java:2042 build/trans_presets.java:2056
+#: build/trans_presets.java:2057 build/trans_presets.java:2058
+#: build/trans_presets.java:2059 build/trans_presets.java:2062
+#: build/trans_presets.java:2078 build/trans_presets.java:2079
+#: build/trans_presets.java:2080 build/trans_presets.java:2081
+#: build/trans_presets.java:2101 build/trans_presets.java:2102
+#: build/trans_presets.java:2103 build/trans_presets.java:2104
+#: build/trans_presets.java:2120 build/trans_presets.java:2121
+#: build/trans_presets.java:2122 build/trans_presets.java:2123
+#: build/trans_presets.java:2137 build/trans_presets.java:2138
+#: build/trans_presets.java:2139 build/trans_presets.java:2140
+#: build/trans_presets.java:2156 build/trans_presets.java:2157
+#: build/trans_presets.java:2158 build/trans_presets.java:2159
+#: build/trans_presets.java:2175 build/trans_presets.java:2176
+#: build/trans_presets.java:2177 build/trans_presets.java:2178
+#: build/trans_presets.java:2191 build/trans_presets.java:2192
+#: build/trans_presets.java:2193 build/trans_presets.java:2194
+#: build/trans_presets.java:2208 build/trans_presets.java:2209
+#: build/trans_presets.java:2210 build/trans_presets.java:2211
+#: build/trans_presets.java:2225 build/trans_presets.java:2226
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2375 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -21210,5 +21223,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:169
 msgid "permissive"
@@ -21255,5 +21268,5 @@
 #: build/trans_presets.java:578 build/trans_presets.java:579
 #: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2362
+#: build/trans_presets.java:583 build/trans_presets.java:2375
 #: build/trans_style.java:174
 msgid "private"
@@ -21440,55 +21453,55 @@
 #: build/trans_presets.java:581 build/trans_presets.java:582
 #: build/trans_presets.java:583 build/trans_presets.java:584
-#: build/trans_presets.java:628 build/trans_presets.java:765
-#: build/trans_presets.java:787 build/trans_presets.java:1297
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1412 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1585
-#: build/trans_presets.java:1586 build/trans_presets.java:1587
-#: build/trans_presets.java:1602 build/trans_presets.java:1693
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1707 build/trans_presets.java:1708
-#: build/trans_presets.java:1709 build/trans_presets.java:1820
-#: build/trans_presets.java:1821 build/trans_presets.java:1822
-#: build/trans_presets.java:1940 build/trans_presets.java:1941
-#: build/trans_presets.java:1942 build/trans_presets.java:1943
-#: build/trans_presets.java:1958 build/trans_presets.java:1959
-#: build/trans_presets.java:1960 build/trans_presets.java:1961
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:1994
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2026 build/trans_presets.java:2027
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2043 build/trans_presets.java:2044
-#: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2049 build/trans_presets.java:2065
-#: build/trans_presets.java:2066 build/trans_presets.java:2067
-#: build/trans_presets.java:2068 build/trans_presets.java:2088
-#: build/trans_presets.java:2089 build/trans_presets.java:2090
-#: build/trans_presets.java:2091 build/trans_presets.java:2107
-#: build/trans_presets.java:2108 build/trans_presets.java:2109
-#: build/trans_presets.java:2110 build/trans_presets.java:2124
-#: build/trans_presets.java:2125 build/trans_presets.java:2126
-#: build/trans_presets.java:2127 build/trans_presets.java:2143
-#: build/trans_presets.java:2144 build/trans_presets.java:2145
-#: build/trans_presets.java:2146 build/trans_presets.java:2162
-#: build/trans_presets.java:2163 build/trans_presets.java:2164
-#: build/trans_presets.java:2165 build/trans_presets.java:2178
-#: build/trans_presets.java:2179 build/trans_presets.java:2180
-#: build/trans_presets.java:2181 build/trans_presets.java:2195
-#: build/trans_presets.java:2196 build/trans_presets.java:2197
-#: build/trans_presets.java:2198 build/trans_presets.java:2212
-#: build/trans_presets.java:2213 build/trans_presets.java:2291
-#: build/trans_presets.java:2301 build/trans_presets.java:2383
-#: build/trans_presets.java:2582 build/trans_presets.java:2634
-#: build/trans_presets.java:2635 build/trans_presets.java:2693
-#: build/trans_presets.java:2709 build/trans_presets.java:2710
-#: build/trans_presets.java:2711 build/trans_presets.java:3142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:640 build/trans_presets.java:777
+#: build/trans_presets.java:799 build/trans_presets.java:1309
+#: build/trans_presets.java:1321 build/trans_presets.java:1333
+#: build/trans_presets.java:1345 build/trans_presets.java:1357
+#: build/trans_presets.java:1369 build/trans_presets.java:1381
+#: build/trans_presets.java:1424 build/trans_presets.java:1593
+#: build/trans_presets.java:1594 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1599
+#: build/trans_presets.java:1614 build/trans_presets.java:1706
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1722 build/trans_presets.java:1833
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1953 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#: build/trans_presets.java:1987 build/trans_presets.java:1988
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2022 build/trans_presets.java:2023
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2039 build/trans_presets.java:2040
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2056 build/trans_presets.java:2057
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2062 build/trans_presets.java:2078
+#: build/trans_presets.java:2079 build/trans_presets.java:2080
+#: build/trans_presets.java:2081 build/trans_presets.java:2101
+#: build/trans_presets.java:2102 build/trans_presets.java:2103
+#: build/trans_presets.java:2104 build/trans_presets.java:2120
+#: build/trans_presets.java:2121 build/trans_presets.java:2122
+#: build/trans_presets.java:2123 build/trans_presets.java:2137
+#: build/trans_presets.java:2138 build/trans_presets.java:2139
+#: build/trans_presets.java:2140 build/trans_presets.java:2156
+#: build/trans_presets.java:2157 build/trans_presets.java:2158
+#: build/trans_presets.java:2159 build/trans_presets.java:2175
+#: build/trans_presets.java:2176 build/trans_presets.java:2177
+#: build/trans_presets.java:2178 build/trans_presets.java:2191
+#: build/trans_presets.java:2192 build/trans_presets.java:2193
+#: build/trans_presets.java:2194 build/trans_presets.java:2208
+#: build/trans_presets.java:2209 build/trans_presets.java:2210
+#: build/trans_presets.java:2211 build/trans_presets.java:2225
+#: build/trans_presets.java:2226 build/trans_presets.java:2304
+#: build/trans_presets.java:2314 build/trans_presets.java:2396
+#: build/trans_presets.java:2595 build/trans_presets.java:2647
+#: build/trans_presets.java:2648 build/trans_presets.java:2706
+#: build/trans_presets.java:2722 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:3155
+#: build/trans_presets.java:3238
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -21580,10 +21593,10 @@
 #. item "Barriers/Sally Port" check "Horse"
 #: build/trans_presets.java:449 build/trans_presets.java:580
-#: build/trans_presets.java:859 build/trans_presets.java:869
-#: build/trans_presets.java:878 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:969
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1006 build/trans_presets.java:1018
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:871 build/trans_presets.java:881
+#: build/trans_presets.java:890 build/trans_presets.java:916
+#: build/trans_presets.java:938 build/trans_presets.java:981
+#: build/trans_presets.java:994 build/trans_presets.java:1006
+#: build/trans_presets.java:1018 build/trans_presets.java:1030
+#: build/trans_presets.java:1070
 msgid "Horse"
 msgstr "馬"
@@ -21621,11 +21634,11 @@
 #. group "Motorcycle"
 #: build/trans_presets.java:454 build/trans_presets.java:548
-#: build/trans_presets.java:860 build/trans_presets.java:870
-#: build/trans_presets.java:879 build/trans_presets.java:890
-#: build/trans_presets.java:905 build/trans_presets.java:927
-#: build/trans_presets.java:970 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1019 build/trans_presets.java:1059
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:872 build/trans_presets.java:882
+#: build/trans_presets.java:891 build/trans_presets.java:902
+#: build/trans_presets.java:917 build/trans_presets.java:939
+#: build/trans_presets.java:982 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1031 build/trans_presets.java:1071
+#: build/trans_presets.java:1699
 msgid "Motorcycle"
 msgstr "機車"
@@ -21644,9 +21657,9 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #: build/trans_presets.java:455 build/trans_presets.java:549
-#: build/trans_presets.java:584 build/trans_presets.java:891
-#: build/trans_presets.java:906 build/trans_presets.java:928
-#: build/trans_presets.java:971 build/trans_presets.java:984
-#: build/trans_presets.java:996 build/trans_presets.java:1008
-#: build/trans_presets.java:1020 build/trans_presets.java:1060
+#: build/trans_presets.java:584 build/trans_presets.java:903
+#: build/trans_presets.java:918 build/trans_presets.java:940
+#: build/trans_presets.java:983 build/trans_presets.java:996
+#: build/trans_presets.java:1008 build/trans_presets.java:1020
+#: build/trans_presets.java:1032 build/trans_presets.java:1072
 msgid "Motorcar"
 msgstr "汽車"
@@ -21734,4 +21747,5 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. </rule>
 #.
@@ -21745,15 +21759,17 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:480 build/trans_style.java:417
-#: build/trans_style.java:423
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:417 build/trans_style.java:423
 msgid "motorway"
 msgstr "高速公路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21768,15 +21784,17 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:480 build/trans_style.java:429
-#: build/trans_style.java:435
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:429 build/trans_style.java:435
 msgid "trunk"
 msgstr "快速道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21791,15 +21809,17 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:480 build/trans_style.java:441
-#: build/trans_style.java:447
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:441 build/trans_style.java:447
 msgid "primary"
 msgstr "省道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "primary_link"
 msgstr "省道連絡道路"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21814,10 +21834,11 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:480 build/trans_style.java:453
-#: build/trans_style.java:459
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:453 build/trans_style.java:459
 msgid "secondary"
 msgstr "縣道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21832,15 +21853,17 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:480 build/trans_style.java:465
-#: build/trans_style.java:471
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:465 build/trans_style.java:471
 msgid "tertiary"
 msgstr "鄉道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "unclassified"
 msgstr "未分類的"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon src="misc/landmark/plant.png"/>
 #. </rule>
@@ -21849,14 +21872,17 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:480 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:2748
 msgid "residential"
 msgstr "居住的"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "living_street"
 msgstr "生活街道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -21892,15 +21918,17 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:480 build/trans_style.java:513
-#: build/trans_style.java:3662
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:513 build/trans_style.java:3662
 msgid "service"
 msgstr "巷/弄"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:480
+#. item "Ways/Cycle Lane" combo "Highway" display value
+#: build/trans_presets.java:480 build/trans_presets.java:621
 msgid "bus_guideway"
 msgstr "公車專用道"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
+#. item "Ways/Cycle Lane" combo "Highway" display value
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. </rule>
@@ -21920,6 +21948,7 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:480 build/trans_style.java:698
-#: build/trans_style.java:2803 build/trans_style.java:2804
+#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_style.java:698 build/trans_style.java:2803
+#: build/trans_style.java:2804
 msgid "construction"
 msgstr "施工"
@@ -22121,5 +22150,5 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:571 build/trans_presets.java:2881
+#: build/trans_presets.java:571 build/trans_presets.java:2894
 msgid "intermediate"
 msgstr "中級"
@@ -22152,13 +22181,13 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1943
-#: build/trans_presets.java:1961 build/trans_presets.java:1977
-#: build/trans_presets.java:1994 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2046
-#: build/trans_presets.java:2068 build/trans_presets.java:2091
-#: build/trans_presets.java:2110 build/trans_presets.java:2127
-#: build/trans_presets.java:2146 build/trans_presets.java:2165
-#: build/trans_presets.java:2181 build/trans_presets.java:2198
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:581 build/trans_presets.java:1956
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007 build/trans_presets.java:2025
+#: build/trans_presets.java:2042 build/trans_presets.java:2059
+#: build/trans_presets.java:2081 build/trans_presets.java:2104
+#: build/trans_presets.java:2123 build/trans_presets.java:2140
+#: build/trans_presets.java:2159 build/trans_presets.java:2178
+#: build/trans_presets.java:2194 build/trans_presets.java:2211
+#: build/trans_presets.java:2226
 msgid "Wheelchairs"
 msgstr "輪椅"
@@ -22188,6 +22217,167 @@
 
 #. </optional>
+#. item "Ways/Cycle Lane"
+#: build/trans_presets.java:612
+msgid "Cycle Lane"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Bicycle" />
+#. item "Ways/Cycle Lane" label "Edit Cycle Lane"
+#: build/trans_presets.java:614
+msgid "Edit Cycle Lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway"
+#: build/trans_presets.java:615
+msgid "Cycleway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2895
+#: build/trans_presets.java:2902 build/trans_presets.java:2910
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2928 build/trans_presets.java:2934
+#: build/trans_presets.java:2940 build/trans_presets.java:2946
+#: build/trans_presets.java:2952 build/trans_presets.java:2958
+#: build/trans_presets.java:2982 build/trans_presets.java:2988
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3012
+#: build/trans_presets.java:3018 build/trans_presets.java:3024
+#: build/trans_presets.java:3030 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081
+msgid "track"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite_track"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "opposite"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "share_busway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway" display value
+#. item "Ways/Cycle Lane" combo "Cycleway left" display value
+#. item "Ways/Cycle Lane" combo "Cycleway right" display value
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:617
+msgid "shared_lane"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway left"
+#: build/trans_presets.java:616
+msgid "Cycleway left"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Cycleway right"
+#: build/trans_presets.java:617
+msgid "Cycleway right"
+msgstr ""
+
+#. item "Ways/Cycle Lane" check "Oneway (bicycle)"
+#: build/trans_presets.java:618
+msgid "Oneway (bicycle)"
+msgstr ""
+
+#. <space />
+#. item "Ways/Cycle Lane" label "Edit Highway"
+#: build/trans_presets.java:620
+msgid "Edit Highway"
+msgstr ""
+
+#. item "Ways/Cycle Lane" combo "Highway"
+#: build/trans_presets.java:621
+msgid "Highway"
+msgstr ""
+
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:624
 msgid "Dedicated Cycleway"
 msgstr "專用自行車道"
@@ -22205,11 +22395,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:616 build/trans_presets.java:638
-#: build/trans_presets.java:662
+#: build/trans_presets.java:628 build/trans_presets.java:650
+#: build/trans_presets.java:674
 msgid "Edit Cycleway"
 msgstr "編輯自行車道"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:628
+#: build/trans_presets.java:640
 msgid "Pedestrians"
 msgstr "行人"
@@ -22217,5 +22407,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:634
+#: build/trans_presets.java:646
 msgid "Segregated Foot- and Cycleway"
 msgstr "分離的步行與自行車道"
@@ -22223,5 +22413,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:670
 msgid "Combined Foot- and Cycleway"
 msgstr "合併的步行與自行車道"
@@ -22229,5 +22419,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:683
+#: build/trans_presets.java:695
 msgid "Dedicated Footway"
 msgstr "專用人行步道"
@@ -22236,5 +22426,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:698
 msgid "Edit Footway"
 msgstr "編輯人行步道"
@@ -22242,5 +22432,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:703
+#: build/trans_presets.java:715
 msgid "Steps"
 msgstr "階梯"
@@ -22250,10 +22440,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:719
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:733
 msgid "Amount of Steps"
 msgstr ""
@@ -22261,5 +22451,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:737
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -22267,5 +22457,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:726
+#: build/trans_presets.java:738
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -22273,10 +22463,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:728
+#: build/trans_presets.java:740
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:744
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22285,10 +22475,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:745
 msgid "Exit to"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:747
 msgid "Services"
 msgstr "休息站"
@@ -22296,5 +22486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:749
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -22310,4 +22500,5 @@
 #. item "Car/Tyres" text "Operator"
 #. item "Car/Rental" text "Operator"
+#. <key key="amenity" value="car_sharing" />
 #. item "Car/Sharing" text "Operator"
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
@@ -22387,42 +22578,42 @@
 #. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:742 build/trans_presets.java:915
-#: build/trans_presets.java:1600 build/trans_presets.java:1624
-#: build/trans_presets.java:1633 build/trans_presets.java:1642
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1673 build/trans_presets.java:1682
-#: build/trans_presets.java:1701 build/trans_presets.java:1840
-#: build/trans_presets.java:1937 build/trans_presets.java:1955
-#: build/trans_presets.java:2006 build/trans_presets.java:2023
-#: build/trans_presets.java:2082 build/trans_presets.java:2103
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2289 build/trans_presets.java:2299
-#: build/trans_presets.java:2360 build/trans_presets.java:2446
-#: build/trans_presets.java:2471 build/trans_presets.java:2514
-#: build/trans_presets.java:2547 build/trans_presets.java:2575
-#: build/trans_presets.java:2592 build/trans_presets.java:2600
-#: build/trans_presets.java:2612 build/trans_presets.java:2632
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2731 build/trans_presets.java:2953
-#: build/trans_presets.java:2962 build/trans_presets.java:3084
-#: build/trans_presets.java:3103 build/trans_presets.java:3122
-#: build/trans_presets.java:3140 build/trans_presets.java:3151
-#: build/trans_presets.java:3167 build/trans_presets.java:3223
-#: build/trans_presets.java:3270 build/trans_presets.java:3278
-#: build/trans_presets.java:3286 build/trans_presets.java:3311
-#: build/trans_presets.java:3426 build/trans_presets.java:3435
-#: build/trans_presets.java:3452 build/trans_presets.java:3461
-#: build/trans_presets.java:3498 build/trans_presets.java:3547
-#: build/trans_presets.java:3570 build/trans_presets.java:3579
-#: build/trans_presets.java:3601 build/trans_presets.java:3616
-#: build/trans_presets.java:3626 build/trans_presets.java:3635
-#: build/trans_presets.java:3663 build/trans_presets.java:3672
-#: build/trans_presets.java:3711 build/trans_presets.java:3727
-#: build/trans_presets.java:3736 build/trans_presets.java:3745
-#: build/trans_presets.java:3761 build/trans_presets.java:3783
-#: build/trans_presets.java:3798 build/trans_presets.java:3807
-#: build/trans_presets.java:4082 build/trans_presets.java:4175
-#: build/trans_presets.java:4324 build/trans_presets.java:4354
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:754 build/trans_presets.java:927
+#: build/trans_presets.java:1612 build/trans_presets.java:1636
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1714 build/trans_presets.java:1853
+#: build/trans_presets.java:1950 build/trans_presets.java:1968
+#: build/trans_presets.java:2019 build/trans_presets.java:2036
+#: build/trans_presets.java:2095 build/trans_presets.java:2116
+#: build/trans_presets.java:2152 build/trans_presets.java:2171
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
+#: build/trans_presets.java:2373 build/trans_presets.java:2459
+#: build/trans_presets.java:2484 build/trans_presets.java:2527
+#: build/trans_presets.java:2560 build/trans_presets.java:2588
+#: build/trans_presets.java:2605 build/trans_presets.java:2613
+#: build/trans_presets.java:2625 build/trans_presets.java:2645
+#: build/trans_presets.java:2654 build/trans_presets.java:2661
+#: build/trans_presets.java:2744 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:3097
+#: build/trans_presets.java:3116 build/trans_presets.java:3135
+#: build/trans_presets.java:3153 build/trans_presets.java:3164
+#: build/trans_presets.java:3180 build/trans_presets.java:3236
+#: build/trans_presets.java:3283 build/trans_presets.java:3291
+#: build/trans_presets.java:3299 build/trans_presets.java:3324
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3465 build/trans_presets.java:3474
+#: build/trans_presets.java:3511 build/trans_presets.java:3560
+#: build/trans_presets.java:3583 build/trans_presets.java:3592
+#: build/trans_presets.java:3614 build/trans_presets.java:3629
+#: build/trans_presets.java:3639 build/trans_presets.java:3648
+#: build/trans_presets.java:3676 build/trans_presets.java:3685
+#: build/trans_presets.java:3724 build/trans_presets.java:3740
+#: build/trans_presets.java:3749 build/trans_presets.java:3758
+#: build/trans_presets.java:3774 build/trans_presets.java:3796
+#: build/trans_presets.java:3811 build/trans_presets.java:3820
+#: build/trans_presets.java:4095 build/trans_presets.java:4188
+#: build/trans_presets.java:4337 build/trans_presets.java:4367
+#: build/trans_presets.java:4389
 msgid "Operator"
 msgstr "經營者"
@@ -22431,6 +22622,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:743 build/trans_presets.java:753
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:755 build/trans_presets.java:765
+#: build/trans_presets.java:2641
 msgid "Toilets"
 msgstr "廁所"
@@ -22438,5 +22629,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:746
+#: build/trans_presets.java:758
 msgid "Rest Area"
 msgstr "休息區"
@@ -22444,5 +22635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:760
 msgid "Edit Rest Area"
 msgstr "編輯休息區"
@@ -22450,5 +22641,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:768
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -22458,5 +22649,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:773
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -22466,5 +22657,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:765
+#: build/trans_presets.java:777
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -22473,6 +22664,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "uncontrolled"
 msgstr "沒有號誌"
@@ -22481,6 +22672,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "traffic_signals"
 msgstr "交通號誌"
@@ -22489,6 +22680,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "island"
 msgstr "安全島"
@@ -22497,6 +22688,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:1424
 msgid "unmarked"
 msgstr "未畫標記"
@@ -22505,6 +22696,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:766 build/trans_presets.java:789
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:778 build/trans_presets.java:801
+#: build/trans_presets.java:1425
 msgid "Cross on horseback"
 msgstr ""
@@ -22513,6 +22704,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:788
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:779 build/trans_presets.java:800
+#: build/trans_presets.java:1426
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -22521,11 +22712,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:768 build/trans_presets.java:790
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:1427
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:769
+#: build/trans_presets.java:781
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -22533,5 +22724,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "zebra"
 msgstr "斑馬線"
@@ -22539,5 +22730,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pelican"
 msgstr ""
@@ -22545,5 +22736,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "toucan"
 msgstr ""
@@ -22551,5 +22742,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "puffin"
 msgstr ""
@@ -22557,5 +22748,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "pegasus"
 msgstr ""
@@ -22563,5 +22754,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:769 build/trans_presets.java:791
+#: build/trans_presets.java:781 build/trans_presets.java:803
 msgid "tiger"
 msgstr ""
@@ -22569,5 +22760,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:784
 msgid "Stop"
 msgstr "禁止通行"
@@ -22575,5 +22766,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:787
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -22584,15 +22775,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:780
+#: build/trans_presets.java:792
 msgid "clockwise"
 msgstr "順時針"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:794
 msgid "Pedestrian Crossing"
 msgstr "行人穿越道"
@@ -22601,15 +22792,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:797
 msgid "Edit Crossing"
 msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:791
+#: build/trans_presets.java:803
 msgid "Type name (UK)"
 msgstr "類型名稱 (英國)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:805
 msgid "Traffic Calming"
 msgstr "道路減速設施"
@@ -22617,40 +22808,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:807
 msgid "Edit Traffic Calming"
 msgstr "編輯道路減速設施"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:796
+#: build/trans_presets.java:808
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:798
+#: build/trans_presets.java:810
 msgid "Passing Place"
 msgstr "讓車處"
@@ -22658,5 +22849,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:812
 msgid "Edit Passing Place"
 msgstr "編輯讓車處"
@@ -22664,5 +22855,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:815
 msgid "Turning Circle"
 msgstr "迴旋圈"
@@ -22672,5 +22863,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:808
+#: build/trans_presets.java:820
 msgid "City Limit"
 msgstr "城市邊界"
@@ -22678,15 +22869,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:822
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:827
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:817
+#: build/trans_presets.java:829
 msgid "Speed Camera"
 msgstr "測速照相"
@@ -22696,5 +22887,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:834
 msgid "Grit Bin"
 msgstr ""
@@ -22704,10 +22895,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr "淺灘"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:828
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -22715,5 +22906,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -22721,5 +22912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -22731,7 +22922,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:842 build/trans_presets.java:2024
-#: build/trans_presets.java:2273 build/trans_presets.java:3948
-#: build/trans_presets.java:3956 build/trans_presets.java:3964
+#: build/trans_presets.java:854 build/trans_presets.java:2037
+#: build/trans_presets.java:2286 build/trans_presets.java:3961
+#: build/trans_presets.java:3969 build/trans_presets.java:3977
 msgid "Elevation"
 msgstr "海拔"
@@ -22766,18 +22957,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:843 build/trans_presets.java:1099
-#: build/trans_presets.java:1110 build/trans_presets.java:1124
-#: build/trans_presets.java:1139 build/trans_presets.java:1866
-#: build/trans_presets.java:2328 build/trans_presets.java:2399
-#: build/trans_presets.java:3326 build/trans_presets.java:3857
-#: build/trans_presets.java:3864 build/trans_presets.java:3871
-#: build/trans_presets.java:3878 build/trans_presets.java:3885
-#: build/trans_presets.java:3893 build/trans_presets.java:3901
-#: build/trans_presets.java:3909 build/trans_presets.java:3916
-#: build/trans_presets.java:3923 build/trans_presets.java:3930
-#: build/trans_presets.java:3939 build/trans_presets.java:3949
-#: build/trans_presets.java:3957 build/trans_presets.java:3965
-#: build/trans_presets.java:3972 build/trans_presets.java:3981
-#: build/trans_presets.java:3989 build/trans_presets.java:4254
+#: build/trans_presets.java:855 build/trans_presets.java:1111
+#: build/trans_presets.java:1122 build/trans_presets.java:1136
+#: build/trans_presets.java:1151 build/trans_presets.java:1879
+#: build/trans_presets.java:2341 build/trans_presets.java:2412
+#: build/trans_presets.java:3339 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3891 build/trans_presets.java:3898
+#: build/trans_presets.java:3906 build/trans_presets.java:3914
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3936 build/trans_presets.java:3943
+#: build/trans_presets.java:3952 build/trans_presets.java:3962
+#: build/trans_presets.java:3970 build/trans_presets.java:3978
+#: build/trans_presets.java:3985 build/trans_presets.java:3994
+#: build/trans_presets.java:4002 build/trans_presets.java:4267
 msgid "Wikipedia"
 msgstr "維基百科"
@@ -22785,5 +22976,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:859
 msgid "Barriers"
 msgstr "障礙物"
@@ -22791,5 +22982,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:850
+#: build/trans_presets.java:862
 msgid "Bollard"
 msgstr "車阻柱"
@@ -22797,5 +22988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:864
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -22845,27 +23036,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:855 build/trans_presets.java:865
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:900 build/trans_presets.java:922
-#: build/trans_presets.java:965 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1014 build/trans_presets.java:1026
-#: build/trans_presets.java:1036 build/trans_presets.java:1045
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:867 build/trans_presets.java:877
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:912 build/trans_presets.java:934
+#: build/trans_presets.java:977 build/trans_presets.java:990
+#: build/trans_presets.java:1002 build/trans_presets.java:1014
+#: build/trans_presets.java:1026 build/trans_presets.java:1038
+#: build/trans_presets.java:1048 build/trans_presets.java:1057
+#: build/trans_presets.java:1066
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:874
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:872
+#: build/trans_presets.java:884
 msgid "Block"
 msgstr "水泥護欄"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:893
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -22873,10 +23064,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:895
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:905
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -22884,15 +23075,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:908
 msgid "Spikes"
 msgstr "長釘"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:897
+#: build/trans_presets.java:909
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:920
 msgid "Toll Booth"
 msgstr "收費站"
@@ -22900,5 +23091,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:910
+#: build/trans_presets.java:922
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -22906,10 +23097,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:930
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:931
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -22918,5 +23109,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:945
 msgid "Hedge"
 msgstr "籬笆"
@@ -22925,5 +23116,5 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:937
+#: build/trans_presets.java:949
 msgid "Fence"
 msgstr "欄柵"
@@ -22932,19 +23123,17 @@
 #. <key key="barrier" value="fence" />
 #. item "Barriers/Wire Fence"
-#: build/trans_presets.java:941
-#, fuzzy
+#: build/trans_presets.java:953
 msgid "Wire Fence"
-msgstr "欄柵"
+msgstr ""
 
 #. <key key="barrier" value="wire_fence" />
 #. item "Barriers/Wood Fence"
-#: build/trans_presets.java:944
-#, fuzzy
+#: build/trans_presets.java:956
 msgid "Wood Fence"
-msgstr "欄柵"
+msgstr ""
 
 #. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:959
 msgid "Wall"
 msgstr "牆"
@@ -22952,5 +23141,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:950
+#: build/trans_presets.java:962
 msgid "City Wall"
 msgstr "城牆"
@@ -22959,5 +23148,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:966
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -22968,15 +23157,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:961
+#: build/trans_presets.java:973
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:974
 msgid "Edit Entrance"
 msgstr "編輯入口"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:985
 msgid "Gate"
 msgstr "閘門"
@@ -22984,50 +23173,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:987
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:986
+#: build/trans_presets.java:998
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:987
+#: build/trans_presets.java:999
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1010
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1011
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1022
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1034
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1043
 msgid "Stile"
 msgstr "柵欄台階"
@@ -23035,25 +23224,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1045
 msgid "Edit Stile"
 msgstr "編輯柵欄台階"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1053
 msgid "Turnstile"
 msgstr "旋轉柵門"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr "編輯旋轉柵門"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1062
 msgid "Sally Port"
 msgstr "城門"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -23063,6 +23252,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1065 build/trans_presets.java:1066
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1077 build/trans_presets.java:1078
+#: build/trans_presets.java:1179
 msgid "Water"
 msgstr "水域"
@@ -23070,5 +23259,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1080
 msgid "Drain"
 msgstr "排水溝"
@@ -23076,10 +23265,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1082
 msgid "Edit Drain"
 msgstr "編輯排水溝"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1088
 msgid "Ditch"
 msgstr ""
@@ -23087,10 +23276,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1090
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1084
+#: build/trans_presets.java:1096
 msgid "Stream"
 msgstr "溪流"
@@ -23098,10 +23287,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1098
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1104
 msgid "Canal"
 msgstr "運河"
@@ -23109,10 +23298,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1106
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1113
 msgid "River"
 msgstr "河流"
@@ -23122,5 +23311,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1105
+#: build/trans_presets.java:1117
 msgid "Edit River"
 msgstr "編輯河流"
@@ -23128,5 +23317,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1125
 msgid "Spring"
 msgstr "泉"
@@ -23134,20 +23323,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1127
 msgid "Edit Spring"
 msgstr "編輯泉"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1131
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1132
 msgid "Edit Waterfall"
 msgstr "編輯瀑布"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1138
 msgid "Weir"
 msgstr "堰"
@@ -23155,10 +23344,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1140
 msgid "Edit Weir"
 msgstr "編輯堰"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1145
 msgid "Dam"
 msgstr "水壩"
@@ -23166,10 +23355,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1147
 msgid "Edit Dam"
 msgstr "編輯水壩"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1153
 msgid "Groyne"
 msgstr ""
@@ -23177,5 +23366,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1155
 msgid "Edit Groyne"
 msgstr ""
@@ -23185,15 +23374,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1160
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
 msgid "Reservoir"
 msgstr "水庫"
@@ -23201,15 +23390,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1168
 msgid "Edit Reservoir Landuse"
 msgstr "編輯水庫"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1173
 msgid "Covered Reservoir"
 msgstr "有覆蓋的水庫"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr "編輯有覆蓋的水庫"
@@ -23217,20 +23406,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1185
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1186
 msgid "Edit Land"
 msgstr "編輯陸地"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
 msgid "Coastline"
 msgstr "海岸線"
@@ -23238,10 +23427,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1192
 msgid "Edit Coastline"
 msgstr "編輯海岸線"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1196
 msgid "Riverbank"
 msgstr "河岸"
@@ -23250,5 +23439,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1199
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
@@ -23256,5 +23445,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1204
 msgid "Wetland"
 msgstr "溼地"
@@ -23265,15 +23454,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1209
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "swamp"
 msgstr "沼澤"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "bog"
 msgstr "泥沼"
@@ -23286,40 +23475,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1200 build/trans_style.java:2930
+#: build/trans_presets.java:1212 build/trans_style.java:2930
 msgid "marsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "reedbed"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "saltmarsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "tidalflat"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1212
 msgid "mangrove"
 msgstr "紅樹林"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1219
 msgid "Beach"
 msgstr "海灘"
@@ -23327,20 +23516,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1221
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1225
 msgid "Bay"
 msgstr "海灣"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1230
 msgid "Cliff"
 msgstr "斷崖"
@@ -23348,15 +23537,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1232
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. group "Shipping"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1237
 msgid "Shipping"
 msgstr "船運"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "Ferry Terminal"
 msgstr "渡輪端點"
@@ -23364,20 +23553,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1240
 msgid "Edit Ferry Terminal"
 msgstr "編輯渡輪端點"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "Cargo"
 msgstr "貨櫃"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers"
 msgstr "乘客"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "vehicle"
 msgstr "車輛"
@@ -23463,6 +23652,6 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1231 build/trans_presets.java:4317
-#: build/trans_presets.java:4347 build/trans_style.java:189
+#: build/trans_presets.java:1243 build/trans_presets.java:4330
+#: build/trans_presets.java:4360 build/trans_style.java:189
 #: build/trans_style.java:525 build/trans_style.java:545
 #: build/trans_style.java:551 build/trans_style.java:570
@@ -23474,15 +23663,15 @@
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "hgv"
 msgstr "大型車"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1243
 msgid "passengers;vehicle"
 msgstr "乘客；車輛"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1245
 msgid "Ferry Route"
 msgstr "渡輪路線"
@@ -23490,5 +23679,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1247
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
@@ -23497,15 +23686,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "Marina"
 msgstr "碼頭"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1244
+#: build/trans_presets.java:1256
 msgid "Edit Marina"
 msgstr "編輯碼頭"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1260
 msgid "Pier"
 msgstr "渡頭"
@@ -23513,10 +23702,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1262
 msgid "Edit Pier"
 msgstr "編輯渡頭"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1266
 msgid "Lock Gate"
 msgstr "調節水門"
@@ -23525,5 +23714,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1270
 msgid "Turning Point"
 msgstr "調轉點"
@@ -23533,5 +23722,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1275
 msgid "Slipway"
 msgstr "船臺"
@@ -23541,10 +23730,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1279
 msgid "Edit Slipway"
 msgstr "編輯造船臺"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1283
 msgid "Boatyard"
 msgstr "造船廠"
@@ -23552,10 +23741,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1285
 msgid "Edit Boatyard"
 msgstr "編輯造船廠"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1290
 msgid "Dock"
 msgstr "船塢"
@@ -23563,20 +23752,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:1292
 msgid "Edit Dock"
 msgstr "編輯船塢"
 
 #. group "Transport"
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1299
 msgid "Transport"
 msgstr "運輸"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1300
 msgid "Railway"
 msgstr "鐵路"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1301
 msgid "Rail"
 msgstr "軌"
@@ -23584,5 +23773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -23612,7 +23801,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1295 build/trans_presets.java:1307
-#: build/trans_presets.java:1331 build/trans_presets.java:1343
-#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1343 build/trans_presets.java:1355
+#: build/trans_presets.java:1367 build/trans_presets.java:1379
 msgid "Gauge (mm)"
 msgstr "軌距 (mm)"
@@ -23628,8 +23817,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "Types"
 msgstr "類型"
@@ -23643,8 +23832,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "yard"
 msgstr ""
@@ -23658,8 +23847,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "siding"
 msgstr ""
@@ -23673,8 +23862,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1296 build/trans_presets.java:1308
-#: build/trans_presets.java:1320 build/trans_presets.java:1332
-#: build/trans_presets.java:1344 build/trans_presets.java:1356
-#: build/trans_presets.java:1368 build/trans_presets.java:1398
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_presets.java:1410
 msgid "spur"
 msgstr ""
@@ -23687,8 +23876,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "Electrified"
 msgstr ""
@@ -23701,8 +23890,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381
 msgid "contact_line"
 msgstr "連接線"
@@ -23763,8 +23952,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1297 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_style.java:595
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -23786,9 +23975,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
-#: build/trans_presets.java:1346 build/trans_presets.java:1358
-#: build/trans_presets.java:1370 build/trans_presets.java:1625
-#: build/trans_presets.java:3314
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382 build/trans_presets.java:1637
+#: build/trans_presets.java:3327
 msgid "Voltage"
 msgstr "電壓"
@@ -23801,8 +23990,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "Frequency (Hz)"
 msgstr "頻率 (Hz)"
@@ -23815,8 +24004,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1299 build/trans_presets.java:1311
-#: build/trans_presets.java:1323 build/trans_presets.java:1335
-#: build/trans_presets.java:1347 build/trans_presets.java:1359
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1311 build/trans_presets.java:1323
+#: build/trans_presets.java:1335 build/trans_presets.java:1347
+#: build/trans_presets.java:1359 build/trans_presets.java:1371
+#: build/trans_presets.java:1383
 msgid "16.7"
 msgstr "16.7"
@@ -23824,10 +24013,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1314
 msgid "Narrow Gauge Rail"
 msgstr "窄軌"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1315
 msgid "Edit Narrow Gauge Rail"
 msgstr "編輯窄軌"
@@ -23835,5 +24024,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1326
 msgid "Monorail"
 msgstr "單軌"
@@ -23841,5 +24030,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1328
 msgid "Edit Monorail"
 msgstr "編輯單軌"
@@ -23847,10 +24036,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1338
 msgid "Preserved"
 msgstr "保留鐵路"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr "編輯保留的鐵路"
@@ -23858,10 +24047,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1350
 msgid "Light Rail"
 msgstr "輕軌電車"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1351
 msgid "Edit Light Rail"
 msgstr "編輯輕軌電車"
@@ -23869,10 +24058,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1362
 msgid "Subway"
 msgstr "地下鐵"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1363
 msgid "Edit Subway"
 msgstr "編輯地下鐵"
@@ -23880,10 +24069,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1374
 msgid "Tram"
 msgstr "路面電車"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1375
 msgid "Edit Tram"
 msgstr "編輯路面電車"
@@ -23891,5 +24080,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1386
 msgid "Bus Guideway"
 msgstr "導軌道巴士"
@@ -23897,5 +24086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1388
 msgid "Edit Bus Guideway"
 msgstr "編輯導軌道巴士"
@@ -23904,10 +24093,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1406
 msgid "Disused Rail"
 msgstr "不使用的軌道"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1407
 msgid "Edit Disused Railway"
 msgstr "編輯不使用的鐵路"
@@ -23916,10 +24105,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1410
 msgid "Optional Types"
 msgstr "選擇性的類型"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1412
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -23928,5 +24117,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1416
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -23935,5 +24124,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1420
 msgid "Crossing"
 msgstr "平交道"
@@ -23943,5 +24132,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1424
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -23949,5 +24138,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1430
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -23956,5 +24145,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1434
 msgid "Buffer Stop"
 msgstr "緩衝停止點"
@@ -23963,10 +24152,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1439
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1440
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -23974,5 +24163,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1442
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
@@ -23994,12 +24183,12 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1433 build/trans_presets.java:1447
-#: build/trans_presets.java:1458 build/trans_presets.java:1471
-#: build/trans_presets.java:1484 build/trans_presets.java:1498
-#: build/trans_presets.java:1509 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1542
-#: build/trans_presets.java:1552 build/trans_presets.java:1579
-#: build/trans_presets.java:2290 build/trans_presets.java:2300
-#: build/trans_presets.java:2633 build/trans_presets.java:3808
+#: build/trans_presets.java:1445 build/trans_presets.java:1459
+#: build/trans_presets.java:1470 build/trans_presets.java:1483
+#: build/trans_presets.java:1496 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1532
+#: build/trans_presets.java:1543 build/trans_presets.java:1554
+#: build/trans_presets.java:1564 build/trans_presets.java:1591
+#: build/trans_presets.java:2303 build/trans_presets.java:2313
+#: build/trans_presets.java:2646 build/trans_presets.java:3821
 msgid "Reference number"
 msgstr "參考編號"
@@ -24025,14 +24214,14 @@
 #. <optional>
 #. item "Aerialway/Magic Carpet" text "Number of people per hour"
-#: build/trans_presets.java:1435 build/trans_presets.java:1449
-#: build/trans_presets.java:1460 build/trans_presets.java:1473
-#: build/trans_presets.java:1486 build/trans_presets.java:1500
-#: build/trans_presets.java:1511 build/trans_presets.java:1522
-#: build/trans_presets.java:1533 build/trans_presets.java:1544
+#: build/trans_presets.java:1447 build/trans_presets.java:1461
+#: build/trans_presets.java:1472 build/trans_presets.java:1485
+#: build/trans_presets.java:1498 build/trans_presets.java:1512
+#: build/trans_presets.java:1523 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1556
 msgid "Number of people per hour"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Number of people per chair"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1448
 msgid "Number of people per chair"
 msgstr ""
@@ -24050,10 +24239,10 @@
 #. <optional>
 #. item "Aerialway/Goods" text "Typical journey time in minutes"
-#: build/trans_presets.java:1437 build/trans_presets.java:1450
-#: build/trans_presets.java:1462 build/trans_presets.java:1475
-#: build/trans_presets.java:1488 build/trans_presets.java:1501
-#: build/trans_presets.java:1512 build/trans_presets.java:1523
-#: build/trans_presets.java:1534 build/trans_presets.java:1545
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1449 build/trans_presets.java:1462
+#: build/trans_presets.java:1474 build/trans_presets.java:1487
+#: build/trans_presets.java:1500 build/trans_presets.java:1513
+#: build/trans_presets.java:1524 build/trans_presets.java:1535
+#: build/trans_presets.java:1546 build/trans_presets.java:1557
+#: build/trans_presets.java:1566
 msgid "Typical journey time in minutes"
 msgstr ""
@@ -24061,5 +24250,5 @@
 #. item "Aerialway/Chair Lift" check "Has bubble?"
 #. item "Aerialway/Mixed Lift" check "Has bubble?"
-#: build/trans_presets.java:1438 build/trans_presets.java:1489
+#: build/trans_presets.java:1450 build/trans_presets.java:1501
 msgid "Has bubble?"
 msgstr ""
@@ -24069,13 +24258,12 @@
 #. item "Aerialway/Gondola" check "Has heating?"
 #. item "Aerialway/Mixed Lift" check "Has heating?"
-#: build/trans_presets.java:1439 build/trans_presets.java:1463
-#: build/trans_presets.java:1476 build/trans_presets.java:1490
-#, fuzzy
+#: build/trans_presets.java:1451 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1502
 msgid "Has heating?"
-msgstr "向東"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1454
 msgid "Drag Lift"
 msgstr ""
@@ -24083,5 +24271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1456
 msgid "Edit Drag Lift"
 msgstr ""
@@ -24089,5 +24277,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1465
 msgid "Cable Car"
 msgstr "大型纜車"
@@ -24095,10 +24283,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1467
 msgid "Edit Cable Car"
 msgstr "編輯大型纜車"
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1473
 msgid "Number of people per car"
 msgstr ""
@@ -24106,5 +24294,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1478
 msgid "Gondola"
 msgstr "纜車"
@@ -24112,10 +24300,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1480
 msgid "Edit Gondola"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Gondola" text "Number of people per gondola"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1486
 msgid "Number of people per gondola"
 msgstr ""
@@ -24123,17 +24311,16 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1479
-#, fuzzy
+#: build/trans_presets.java:1491
 msgid "Mixed Lift"
-msgstr "滑雪纜車"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1493
 msgid "Edit Mixed Lift (containing both gondolas and chairs)"
 msgstr ""
 
 #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
-#: build/trans_presets.java:1487
+#: build/trans_presets.java:1499
 msgid "Number of people per gondola/chair"
 msgstr ""
@@ -24141,61 +24328,53 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1493
-#, fuzzy
+#: build/trans_presets.java:1505
 msgid "T-bar Lift"
-msgstr "滑雪纜車"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
-#: build/trans_presets.java:1495
-#, fuzzy
+#: build/trans_presets.java:1507
 msgid "Edit T-bar Lift"
-msgstr "編輯滑雪纜車"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1504
-#, fuzzy
+#: build/trans_presets.java:1516
 msgid "J-bar Lift"
-msgstr "滑雪纜車"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
-#: build/trans_presets.java:1506
-#, fuzzy
+#: build/trans_presets.java:1518
 msgid "Edit J-bar Lift"
-msgstr "編輯滑雪纜車"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1515
-#, fuzzy
+#: build/trans_presets.java:1527
 msgid "Platter Lift"
-msgstr "滑雪纜車"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Platter Lift" label "Edit Platter Lift"
-#: build/trans_presets.java:1517
-#, fuzzy
+#: build/trans_presets.java:1529
 msgid "Edit Platter Lift"
-msgstr "編輯滑雪纜車"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1526
-#, fuzzy
+#: build/trans_presets.java:1538
 msgid "Rope Tow"
-msgstr "電塔"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Rope Tow" label "Edit Rope Tow"
-#: build/trans_presets.java:1528
-#, fuzzy
+#: build/trans_presets.java:1540
 msgid "Edit Rope Tow"
-msgstr "編輯電塔"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1549
 msgid "Magic Carpet"
 msgstr ""
@@ -24203,12 +24382,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
-#: build/trans_presets.java:1539
-#, fuzzy
+#: build/trans_presets.java:1551
 msgid "Edit Magic Carpet"
-msgstr "編輯大型纜車"
+msgstr ""
 
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Goods"
@@ -24216,5 +24394,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1561
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24224,5 +24402,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1570
 msgctxt "aerialway"
 msgid "Station"
@@ -24231,5 +24409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1572
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24237,5 +24415,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1576
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24244,5 +24422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1578
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24260,6 +24438,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1573 build/trans_presets.java:1687
-#: build/trans_presets.java:1719 build/trans_surveyor.java:24
+#: build/trans_presets.java:1585 build/trans_presets.java:1700
+#: build/trans_presets.java:1732 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "停車場"
@@ -24268,5 +24446,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1588
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -24274,5 +24452,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "multi-storey"
 msgstr "塔式"
@@ -24280,5 +24458,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "surface"
 msgstr "平面式"
@@ -24286,10 +24464,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1580 build/trans_presets.java:1692
+#: build/trans_presets.java:1592 build/trans_presets.java:1705
 msgid "underground"
 msgstr "地下"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1593
 msgid "Park and Ride"
 msgstr ""
@@ -24300,7 +24478,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1582 build/trans_presets.java:1693
-#: build/trans_presets.java:2291 build/trans_presets.java:2301
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:1594 build/trans_presets.java:1706
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2647
 msgid "Fee"
 msgstr "費用"
@@ -24308,25 +24486,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1596
 msgid "Capacity (overall)"
 msgstr "容量 (整體)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1597
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1598
 msgid "Spaces for Women"
 msgstr "女性專用空間"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1599
 msgid "Spaces for Parents"
 msgstr "父母專用空間"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1600
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "查閱 Wiki 上的其他容量:[types]=*。"
@@ -24334,5 +24512,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1603
 msgid "Fuel"
 msgstr "加油站"
@@ -24342,5 +24520,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1607
 msgid "Edit Fuel"
 msgstr "編輯加油站"
@@ -24352,120 +24530,118 @@
 #. item "Car/Tyres" text "Brand"
 #. item "Car/Rental" text "Brand"
-#. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1597 build/trans_presets.java:1632
-#: build/trans_presets.java:1648 build/trans_presets.java:1656
-#: build/trans_presets.java:1672 build/trans_presets.java:1681
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1609 build/trans_presets.java:1644
+#: build/trans_presets.java:1660 build/trans_presets.java:1668
+#: build/trans_presets.java:1684 build/trans_presets.java:1713
 msgid "Brand"
 msgstr "品牌"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Total"
 msgstr "Total"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Independent"
 msgstr "Independent"
@@ -24558,48 +24734,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2226
-#: build/trans_presets.java:2241 build/trans_presets.java:2327
-#: build/trans_presets.java:2338 build/trans_presets.java:2345
-#: build/trans_presets.java:2361 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2601 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2239
+#: build/trans_presets.java:2254 build/trans_presets.java:2340
+#: build/trans_presets.java:2351 build/trans_presets.java:2358
+#: build/trans_presets.java:2374 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2614 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "Opening Hours"
 msgstr "開放時間"
@@ -24690,47 +24866,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2472 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2584
-#: build/trans_presets.java:2593 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3443
-#: build/trans_presets.java:3453 build/trans_presets.java:3462
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2485 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2597
+#: build/trans_presets.java:2606 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3456
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
 #: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3533
-#: build/trans_presets.java:3539 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3627 build/trans_presets.java:3636
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3712
-#: build/trans_presets.java:3719 build/trans_presets.java:3728
-#: build/trans_presets.java:3737 build/trans_presets.java:3746
-#: build/trans_presets.java:3753 build/trans_presets.java:3762
-#: build/trans_presets.java:3768 build/trans_presets.java:3775
-#: build/trans_presets.java:3784 build/trans_presets.java:3790
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3525 build/trans_presets.java:3531
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3552 build/trans_presets.java:3561
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3725
+#: build/trans_presets.java:3732 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3766 build/trans_presets.java:3775
+#: build/trans_presets.java:3781 build/trans_presets.java:3788
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3812
 msgid "24/7"
 msgstr "24/7"
@@ -24822,47 +24998,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2361
-#: build/trans_presets.java:2398 build/trans_presets.java:2414
-#: build/trans_presets.java:2438 build/trans_presets.java:2472
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2593
-#: build/trans_presets.java:2624 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:3332
-#: build/trans_presets.java:3340 build/trans_presets.java:3389
-#: build/trans_presets.java:3396 build/trans_presets.java:3403
-#: build/trans_presets.java:3411 build/trans_presets.java:3418
-#: build/trans_presets.java:3427 build/trans_presets.java:3436
-#: build/trans_presets.java:3443 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3468
-#: build/trans_presets.java:3476 build/trans_presets.java:3482
-#: build/trans_presets.java:3490 build/trans_presets.java:3499
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3548 build/trans_presets.java:3556
-#: build/trans_presets.java:3562 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3586
-#: build/trans_presets.java:3592 build/trans_presets.java:3602
-#: build/trans_presets.java:3610 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3643
-#: build/trans_presets.java:3649 build/trans_presets.java:3655
-#: build/trans_presets.java:3664 build/trans_presets.java:3673
-#: build/trans_presets.java:3681 build/trans_presets.java:3688
-#: build/trans_presets.java:3696 build/trans_presets.java:3703
-#: build/trans_presets.java:3712 build/trans_presets.java:3719
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3753
-#: build/trans_presets.java:3762 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3790 build/trans_presets.java:3799
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2374
+#: build/trans_presets.java:2411 build/trans_presets.java:2427
+#: build/trans_presets.java:2451 build/trans_presets.java:2485
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2606
+#: build/trans_presets.java:2637 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:3345
+#: build/trans_presets.java:3353 build/trans_presets.java:3402
+#: build/trans_presets.java:3409 build/trans_presets.java:3416
+#: build/trans_presets.java:3424 build/trans_presets.java:3431
+#: build/trans_presets.java:3440 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3495
+#: build/trans_presets.java:3503 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3575 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3599
+#: build/trans_presets.java:3605 build/trans_presets.java:3615
+#: build/trans_presets.java:3623 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3656
+#: build/trans_presets.java:3662 build/trans_presets.java:3668
+#: build/trans_presets.java:3677 build/trans_presets.java:3686
+#: build/trans_presets.java:3694 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3725 build/trans_presets.java:3732
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3766
+#: build/trans_presets.java:3775 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3797
+#: build/trans_presets.java:3803 build/trans_presets.java:3812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "週一-週五 08:30-20:00"
@@ -24932,126 +25108,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1601 build/trans_presets.java:1634
-#: build/trans_presets.java:1650 build/trans_presets.java:1658
-#: build/trans_presets.java:1674 build/trans_presets.java:1683
-#: build/trans_presets.java:1702 build/trans_presets.java:2085
-#: build/trans_presets.java:2105 build/trans_presets.java:2122
-#: build/trans_presets.java:2141 build/trans_presets.java:2160
-#: build/trans_presets.java:2176 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2241
-#: build/trans_presets.java:2327 build/trans_presets.java:2338
-#: build/trans_presets.java:2345 build/trans_presets.java:2398
-#: build/trans_presets.java:2414 build/trans_presets.java:2438
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2584 build/trans_presets.java:2624
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:3332 build/trans_presets.java:3340
-#: build/trans_presets.java:3389 build/trans_presets.java:3396
-#: build/trans_presets.java:3403 build/trans_presets.java:3411
-#: build/trans_presets.java:3418 build/trans_presets.java:3443
-#: build/trans_presets.java:3468 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3490
-#: build/trans_presets.java:3505 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3526
-#: build/trans_presets.java:3533 build/trans_presets.java:3539
-#: build/trans_presets.java:3556 build/trans_presets.java:3562
-#: build/trans_presets.java:3586 build/trans_presets.java:3592
-#: build/trans_presets.java:3602 build/trans_presets.java:3610
-#: build/trans_presets.java:3643 build/trans_presets.java:3649
-#: build/trans_presets.java:3655 build/trans_presets.java:3681
-#: build/trans_presets.java:3688 build/trans_presets.java:3696
-#: build/trans_presets.java:3703 build/trans_presets.java:3719
-#: build/trans_presets.java:3753 build/trans_presets.java:3768
-#: build/trans_presets.java:3775 build/trans_presets.java:3790
+#: build/trans_presets.java:1613 build/trans_presets.java:1646
+#: build/trans_presets.java:1662 build/trans_presets.java:1670
+#: build/trans_presets.java:1686 build/trans_presets.java:1695
+#: build/trans_presets.java:1715 build/trans_presets.java:2098
+#: build/trans_presets.java:2118 build/trans_presets.java:2135
+#: build/trans_presets.java:2154 build/trans_presets.java:2173
+#: build/trans_presets.java:2189 build/trans_presets.java:2206
+#: build/trans_presets.java:2223 build/trans_presets.java:2254
+#: build/trans_presets.java:2340 build/trans_presets.java:2351
+#: build/trans_presets.java:2358 build/trans_presets.java:2411
+#: build/trans_presets.java:2427 build/trans_presets.java:2451
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2597 build/trans_presets.java:2637
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3416 build/trans_presets.java:3424
+#: build/trans_presets.java:3431 build/trans_presets.java:3456
+#: build/trans_presets.java:3481 build/trans_presets.java:3489
+#: build/trans_presets.java:3495 build/trans_presets.java:3503
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3569 build/trans_presets.java:3575
+#: build/trans_presets.java:3599 build/trans_presets.java:3605
+#: build/trans_presets.java:3615 build/trans_presets.java:3623
+#: build/trans_presets.java:3656 build/trans_presets.java:3662
+#: build/trans_presets.java:3668 build/trans_presets.java:3694
+#: build/trans_presets.java:3701 build/trans_presets.java:3709
+#: build/trans_presets.java:3716 build/trans_presets.java:3732
+#: build/trans_presets.java:3766 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3803
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "With shop"
 msgstr "附設商店"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "convenience"
 msgstr "便利商店"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1615
 msgid "Fuel types:"
 msgstr "燃料類型："
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1616
 msgid "Diesel"
 msgstr "柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1617
 msgid "Bio Diesel"
 msgstr "生質柴油"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1618
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "重型貨車柴油"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1620
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1621
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1622
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1623
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1624
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1625
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1626
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (液化石油氣)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1627
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (壓縮天然氣)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1628
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1629
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25059,5 +25235,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1632
 msgid "Charging Station"
 msgstr "充電站"
@@ -25065,20 +25241,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1634
 msgid "Edit Charging Station (for electric cars)"
 msgstr "編輯充電站（電動車輛用）"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1638
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1640
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "編輯"
@@ -25086,5 +25262,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1649
 msgid "Car Dealer"
 msgstr "汽車經銷商"
@@ -25092,5 +25268,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1651
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
@@ -25098,20 +25274,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1644 build/trans_presets.java:1706
+#: build/trans_presets.java:1656 build/trans_presets.java:1719
 msgid "Repair"
 msgstr "修車場"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1657
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1664
 msgid "Tyres"
 msgstr "輪胎"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr "編輯輪胎"
@@ -25119,5 +25295,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1659 build/trans_presets.java:1711
+#: build/trans_presets.java:1671 build/trans_presets.java:1724
 msgid "Contact:"
 msgstr "連絡方式："
@@ -25161,15 +25337,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1660 build/trans_presets.java:1712
-#: build/trans_presets.java:1945 build/trans_presets.java:1963
-#: build/trans_presets.java:1979 build/trans_presets.java:1996
-#: build/trans_presets.java:2014 build/trans_presets.java:2031
-#: build/trans_presets.java:2053 build/trans_presets.java:2070
-#: build/trans_presets.java:2093 build/trans_presets.java:2112
-#: build/trans_presets.java:2129 build/trans_presets.java:2148
-#: build/trans_presets.java:2167 build/trans_presets.java:2183
-#: build/trans_presets.java:2200 build/trans_presets.java:2215
-#: build/trans_presets.java:2448 build/trans_presets.java:2613
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:1672 build/trans_presets.java:1725
+#: build/trans_presets.java:1958 build/trans_presets.java:1976
+#: build/trans_presets.java:1992 build/trans_presets.java:2009
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2066 build/trans_presets.java:2083
+#: build/trans_presets.java:2106 build/trans_presets.java:2125
+#: build/trans_presets.java:2142 build/trans_presets.java:2161
+#: build/trans_presets.java:2180 build/trans_presets.java:2196
+#: build/trans_presets.java:2213 build/trans_presets.java:2228
+#: build/trans_presets.java:2461 build/trans_presets.java:2626
+#: build/trans_presets.java:4261
 msgid "Phone Number"
 msgstr "電話號碼"
@@ -25194,18 +25370,19 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1661 build/trans_presets.java:1713
-#: build/trans_presets.java:1946 build/trans_presets.java:1964
-#: build/trans_presets.java:1980 build/trans_presets.java:1997
-#: build/trans_presets.java:2015 build/trans_presets.java:2032
-#: build/trans_presets.java:2054 build/trans_presets.java:2071
-#: build/trans_presets.java:2094 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2149
-#: build/trans_presets.java:2168 build/trans_presets.java:2184
-#: build/trans_presets.java:2201 build/trans_presets.java:2216
-#: build/trans_presets.java:4249
+#: build/trans_presets.java:1673 build/trans_presets.java:1726
+#: build/trans_presets.java:1959 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2028 build/trans_presets.java:2045
+#: build/trans_presets.java:2067 build/trans_presets.java:2084
+#: build/trans_presets.java:2107 build/trans_presets.java:2126
+#: build/trans_presets.java:2143 build/trans_presets.java:2162
+#: build/trans_presets.java:2181 build/trans_presets.java:2197
+#: build/trans_presets.java:2214 build/trans_presets.java:2229
+#: build/trans_presets.java:4262
 msgid "Fax Number"
 msgstr "傳真號碼"
 
 #. item "Car/Tyres" text "Website"
+#. item "Car/Sharing" text "Website"
 #. item "Motorcycle/Motorcycle Dealer" text "Website"
 #. item "Facilities/Accommodation/Hotel" text "Website"
@@ -25228,14 +25405,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1662 build/trans_presets.java:1714
-#: build/trans_presets.java:1947 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1998
-#: build/trans_presets.java:2016 build/trans_presets.java:2033
-#: build/trans_presets.java:2055 build/trans_presets.java:2072
-#: build/trans_presets.java:2095 build/trans_presets.java:2114
-#: build/trans_presets.java:2131 build/trans_presets.java:2150
-#: build/trans_presets.java:2169 build/trans_presets.java:2185
-#: build/trans_presets.java:2202 build/trans_presets.java:2217
-#: build/trans_presets.java:2449 build/trans_presets.java:4251
+#: build/trans_presets.java:1674 build/trans_presets.java:1696
+#: build/trans_presets.java:1727 build/trans_presets.java:1960
+#: build/trans_presets.java:1978 build/trans_presets.java:1994
+#: build/trans_presets.java:2011 build/trans_presets.java:2029
+#: build/trans_presets.java:2046 build/trans_presets.java:2068
+#: build/trans_presets.java:2085 build/trans_presets.java:2108
+#: build/trans_presets.java:2127 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2182
+#: build/trans_presets.java:2198 build/trans_presets.java:2215
+#: build/trans_presets.java:2230 build/trans_presets.java:2462
+#: build/trans_presets.java:4264
 msgid "Website"
 msgstr "網站"
@@ -25260,14 +25438,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1663 build/trans_presets.java:1715
-#: build/trans_presets.java:1948 build/trans_presets.java:1966
-#: build/trans_presets.java:1982 build/trans_presets.java:1999
-#: build/trans_presets.java:2017 build/trans_presets.java:2034
-#: build/trans_presets.java:2056 build/trans_presets.java:2073
-#: build/trans_presets.java:2096 build/trans_presets.java:2115
-#: build/trans_presets.java:2132 build/trans_presets.java:2151
-#: build/trans_presets.java:2170 build/trans_presets.java:2186
-#: build/trans_presets.java:2203 build/trans_presets.java:2218
-#: build/trans_presets.java:4252
+#: build/trans_presets.java:1675 build/trans_presets.java:1728
+#: build/trans_presets.java:1961 build/trans_presets.java:1979
+#: build/trans_presets.java:1995 build/trans_presets.java:2012
+#: build/trans_presets.java:2030 build/trans_presets.java:2047
+#: build/trans_presets.java:2069 build/trans_presets.java:2086
+#: build/trans_presets.java:2109 build/trans_presets.java:2128
+#: build/trans_presets.java:2145 build/trans_presets.java:2164
+#: build/trans_presets.java:2183 build/trans_presets.java:2199
+#: build/trans_presets.java:2216 build/trans_presets.java:2231
+#: build/trans_presets.java:4265
 msgid "Email Address"
 msgstr "電子郵件位址"
@@ -25277,6 +25455,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1666 build/trans_presets.java:1705
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1678 build/trans_presets.java:1718
+#: build/trans_presets.java:1753
 msgid "Rental"
 msgstr "租車"
@@ -25285,10 +25463,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1681
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1688
 msgid "Sharing"
 msgstr "汽車分享"
@@ -25296,21 +25474,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1690
 msgid "Edit Car Sharing"
 msgstr "編輯汽車分享"
 
+#. item "Car/Sharing" text "Capacity"
+#. item "Motorcycle/Parking" text "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1693 build/trans_presets.java:1704
+#: build/trans_presets.java:1737
+msgid "Capacity"
+msgstr "容量"
+
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1701
 msgid "Edit Motorcycle Parking"
 msgstr "編輯摩托車停車場"
 
-#. item "Motorcycle/Parking" text "Capacity"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1691 build/trans_presets.java:1724
-msgid "Capacity"
-msgstr "容量"
-
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1708
 msgid "Motorcycle Dealer"
 msgstr "摩托車經銷商"
@@ -25318,25 +25498,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1710
 msgid "Edit Shop Motorcycle"
 msgstr "編輯摩托車商店"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1713
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1716
 msgid "Services:"
 msgstr "服務："
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "yes"
@@ -25344,5 +25524,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "brand"
@@ -25350,5 +25530,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "used"
@@ -25356,5 +25536,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1717
 msgctxt "motorcycle"
 msgid "no"
@@ -25365,6 +25545,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
 msgid "brand"
 msgstr ""
@@ -25372,35 +25552,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1706 build/trans_presets.java:1708
+#: build/trans_presets.java:1719 build/trans_presets.java:1721
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "Safety inspection"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "DEKRA"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "GTÜ"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "MOT"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1720
 msgid "TÜV"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1721
 msgid "Parts"
 msgstr ""
@@ -25410,6 +25590,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2678
-#: build/trans_presets.java:3485 build/trans_presets.java:3486
+#: build/trans_presets.java:1722 build/trans_presets.java:2691
+#: build/trans_presets.java:3498 build/trans_presets.java:3499
 msgid "Clothes"
 msgstr "衣服"
@@ -25417,10 +25597,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1734
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1739
 msgid "Bike Dealer"
 msgstr "自行車經銷商"
@@ -25429,40 +25609,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1742
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1745
 msgid "Bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1746
 msgid "Second-hand bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1747
 msgid "Bicycles are repaired"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1748
 msgid "Bicycles are rented"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1749
 msgid "Free bicycle pump"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1750
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1751
 msgid "Bicycles are washed (for a fee)"
 msgstr ""
@@ -25471,10 +25651,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1756
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1761
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -25482,5 +25662,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1762
 msgctxt "railway"
 msgid "Station"
@@ -25490,5 +25670,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1765
 msgctxt "railway"
 msgid "Edit Station"
@@ -25496,5 +25676,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1770
 msgid "UIC-Reference"
 msgstr "UIC-參考"
@@ -25502,5 +25682,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1773
 msgid "Railway Halt"
 msgstr "鐵路招呼站"
@@ -25508,5 +25688,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1775
 msgid "Edit Halt"
 msgstr "編輯招呼站"
@@ -25514,5 +25694,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1782
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -25521,5 +25701,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1785
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -25527,5 +25707,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1792
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -25534,5 +25714,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1795
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -25544,5 +25724,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1785 build/trans_presets.java:1830
+#: build/trans_presets.java:1798 build/trans_presets.java:1843
 msgid "Reference (track number)"
 msgstr ""
@@ -25551,11 +25731,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1787 build/trans_presets.java:1832
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:1800 build/trans_presets.java:1845
+#: build/trans_presets.java:2349
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1802
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -25564,5 +25744,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1805
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
@@ -25570,5 +25750,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1797 build/trans_presets.java:2635
+#: build/trans_presets.java:1810 build/trans_presets.java:2648
 msgid "Wheelchair"
 msgstr "輪椅"
@@ -25577,5 +25757,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1815
 msgid "Bus Station"
 msgstr "公車車站"
@@ -25584,5 +25764,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1818
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -25590,5 +25770,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1824
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -25598,5 +25778,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1828
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
@@ -25605,6 +25785,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1820 build/trans_presets.java:2698
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:1833 build/trans_presets.java:2711
+#: build/trans_presets.java:2722
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -25616,10 +25796,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1821 build/trans_presets.java:2690
+#: build/trans_presets.java:1834 build/trans_presets.java:2703
 msgid "Bench"
 msgstr "長椅"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1835
 msgid "Tactile Paving"
 msgstr ""
@@ -25627,10 +25807,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1839
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1840
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -25638,10 +25818,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1848
 msgid "Ticket Machine"
 msgstr "售票機"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1854
 msgid "Reference Number"
 msgstr ""
@@ -25650,6 +25830,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1842 build/trans_presets.java:2649
-#: build/trans_presets.java:3810
+#: build/trans_presets.java:1855 build/trans_presets.java:2662
+#: build/trans_presets.java:3823
 msgid "Coins"
 msgstr "硬幣"
@@ -25658,6 +25838,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1843 build/trans_presets.java:2650
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:1856 build/trans_presets.java:2663
+#: build/trans_presets.java:3824
 msgid "Notes"
 msgstr ""
@@ -25666,6 +25846,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1844 build/trans_presets.java:2651
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1857 build/trans_presets.java:2664
+#: build/trans_presets.java:3825
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -25674,6 +25854,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1845 build/trans_presets.java:2652
-#: build/trans_presets.java:3813
+#: build/trans_presets.java:1858 build/trans_presets.java:2665
+#: build/trans_presets.java:3826
 msgid "Debit cards"
 msgstr ""
@@ -25682,6 +25862,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1846 build/trans_presets.java:2653
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:1859 build/trans_presets.java:2666
+#: build/trans_presets.java:3827
 msgid "Credit cards"
 msgstr "信用卡"
@@ -25689,10 +25869,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1847 build/trans_presets.java:3815
+#: build/trans_presets.java:1860 build/trans_presets.java:3828
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Taxi"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1863
 msgid "Taxi"
 msgstr "計程車"
@@ -25700,5 +25880,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1865
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -25706,10 +25886,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1870
 msgid "Airport"
 msgstr "機場"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1871
 msgid "Airport Ground"
 msgstr "機場地面"
@@ -25717,5 +25897,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1873
 msgid "Edit Airport Ground"
 msgstr "編輯機場地面"
@@ -25723,10 +25903,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1877
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1878
 msgid "ICAO"
 msgstr "ICAO"
@@ -25735,5 +25915,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1883
 msgid "Runway"
 msgstr "飛機跑道"
@@ -25741,5 +25921,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1885
 msgid "Edit Runway"
 msgstr "編輯飛機跑道"
@@ -25747,5 +25927,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1891
 msgid "Taxiway"
 msgstr "滑行跑道"
@@ -25753,5 +25933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1893
 msgid "Edit Taxiway"
 msgstr "編輯滑行跑道"
@@ -25759,5 +25939,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1899
 msgid "Helipad"
 msgstr "直升機停機坪"
@@ -25765,5 +25945,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1901
 msgid "Edit Helipad"
 msgstr "編輯直升機停機坪"
@@ -25773,5 +25953,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1894 build/trans_presets.java:1896
+#: build/trans_presets.java:1907 build/trans_presets.java:1909
 msgid "Apron"
 msgstr "停機坪"
@@ -25781,5 +25961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1899 build/trans_presets.java:1901
+#: build/trans_presets.java:1912 build/trans_presets.java:1914
 msgid "Hangar"
 msgstr "飛機庫"
@@ -25790,6 +25970,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1904 build/trans_presets.java:1906
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:1917 build/trans_presets.java:1919
+#: build/trans_presets.java:3217
 msgid "Beacon"
 msgstr ""
@@ -25799,5 +25979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1909 build/trans_presets.java:1911
+#: build/trans_presets.java:1922 build/trans_presets.java:1924
 msgid "Windsock"
 msgstr ""
@@ -25806,5 +25986,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1928
 msgid "Terminal"
 msgstr "航廈"
@@ -25812,10 +25992,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1930
 msgid "Edit Terminal"
 msgstr "編輯航廈"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1934
 msgctxt "airport"
 msgid "Gate"
@@ -25824,15 +26004,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1936
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. group "Facilities"
-#: build/trans_presets.java:1929 build/trans_presets.java:2627
+#: build/trans_presets.java:1942 build/trans_presets.java:2640
 msgid "Facilities"
 msgstr "設施"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1943
 msgid "Accommodation"
 msgstr "住宿"
@@ -25844,5 +26024,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1931 build/trans_surveyor.java:43
+#: build/trans_presets.java:1944 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -25851,5 +26031,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1947
 msgid "Edit Hotel"
 msgstr "編輯旅館"
@@ -25863,8 +26043,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1938 build/trans_presets.java:1956
-#: build/trans_presets.java:1972 build/trans_presets.java:1989
-#: build/trans_presets.java:2007 build/trans_presets.java:2041
-#: build/trans_presets.java:2063 build/trans_presets.java:2086
+#: build/trans_presets.java:1951 build/trans_presets.java:1969
+#: build/trans_presets.java:1985 build/trans_presets.java:2002
+#: build/trans_presets.java:2020 build/trans_presets.java:2054
+#: build/trans_presets.java:2076 build/trans_presets.java:2099
 msgid "Stars"
 msgstr "星級"
@@ -25900,12 +26080,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "Internet access"
 msgstr "附設網際網路"
@@ -25926,12 +26106,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wlan"
 msgstr "無線網路"
@@ -25952,12 +26132,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208
 msgid "wired"
 msgstr "有線網路"
@@ -25984,12 +26164,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1940 build/trans_presets.java:1958
-#: build/trans_presets.java:1974 build/trans_presets.java:1991
-#: build/trans_presets.java:2009 build/trans_presets.java:2026
-#: build/trans_presets.java:2043 build/trans_presets.java:2065
-#: build/trans_presets.java:2088 build/trans_presets.java:2107
-#: build/trans_presets.java:2124 build/trans_presets.java:2143
-#: build/trans_presets.java:2162 build/trans_presets.java:2178
-#: build/trans_presets.java:2195 build/trans_style.java:1069
+#: build/trans_presets.java:1953 build/trans_presets.java:1971
+#: build/trans_presets.java:1987 build/trans_presets.java:2004
+#: build/trans_presets.java:2022 build/trans_presets.java:2039
+#: build/trans_presets.java:2056 build/trans_presets.java:2078
+#: build/trans_presets.java:2101 build/trans_presets.java:2120
+#: build/trans_presets.java:2137 build/trans_presets.java:2156
+#: build/trans_presets.java:2175 build/trans_presets.java:2191
+#: build/trans_presets.java:2208 build/trans_style.java:1069
 msgid "terminal"
 msgstr ""
@@ -26010,12 +26190,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1941 build/trans_presets.java:1959
-#: build/trans_presets.java:1975 build/trans_presets.java:1992
-#: build/trans_presets.java:2010 build/trans_presets.java:2027
-#: build/trans_presets.java:2044 build/trans_presets.java:2066
-#: build/trans_presets.java:2089 build/trans_presets.java:2108
-#: build/trans_presets.java:2125 build/trans_presets.java:2144
-#: build/trans_presets.java:2163 build/trans_presets.java:2179
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "Internet access fee"
 msgstr "網際網路使用費"
@@ -26038,12 +26218,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "Smoking"
 msgstr "吸菸區"
@@ -26065,12 +26245,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "dedicated"
 msgstr "專用"
@@ -26092,12 +26272,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "separated"
 msgstr "個別"
@@ -26119,17 +26299,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1942 build/trans_presets.java:1960
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2045 build/trans_presets.java:2067
-#: build/trans_presets.java:2090 build/trans_presets.java:2109
-#: build/trans_presets.java:2126 build/trans_presets.java:2145
-#: build/trans_presets.java:2164 build/trans_presets.java:2180
-#: build/trans_presets.java:2197 build/trans_presets.java:2212
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2225
 msgid "isolated"
 msgstr "分離"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1963
 msgid "Motel"
 msgstr "汽車旅館"
@@ -26137,20 +26317,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1965
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1981
 msgid "Guest House"
 msgstr ""
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1982
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1997
 msgid "Chalet"
 msgstr "小木屋"
@@ -26158,10 +26338,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1999
 msgid "Edit Chalet"
 msgstr "編輯小木屋"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2014
 msgid "Hostel"
 msgstr "招待所"
@@ -26169,15 +26349,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2016
 msgid "Edit Hostel"
 msgstr "編輯招待所"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2032
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2033
 msgid "Edit Alpine Hut"
 msgstr "編輯高山小屋"
@@ -26185,10 +26365,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2050
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2051
 msgid "Edit Caravan Site"
 msgstr ""
@@ -26196,30 +26376,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2061
 msgid "Number of places"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "Requires a fee"
 msgstr "需要收費"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2062
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2063
 msgid "Power supply"
 msgstr "電源供應"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2064
 msgid "Tents allowed"
 msgstr "允許帳篷"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2071
 msgid "Camping Site"
 msgstr "露營區"
@@ -26227,10 +26407,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2073
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2089
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -26241,5 +26421,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2077 build/trans_surveyor.java:47
+#: build/trans_presets.java:2090 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -26247,5 +26427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2092
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -26254,6 +26434,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2153
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -26261,5 +26441,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "italian"
 msgstr "義式料理"
@@ -26267,5 +26447,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "chinese"
 msgstr "中式料理"
@@ -26273,5 +26453,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "pizza"
 msgstr "披薩"
@@ -26279,5 +26459,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "burger"
 msgstr "漢堡"
@@ -26285,5 +26465,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "greek"
 msgstr "希臘料理"
@@ -26291,5 +26471,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "german"
 msgstr "德式料理"
@@ -26297,5 +26477,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "indian"
 msgstr "印度料理"
@@ -26303,5 +26483,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "regional"
 msgstr "地方料理"
@@ -26309,5 +26489,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "kebab"
 msgstr "烤肉串"
@@ -26315,5 +26495,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "turkish"
 msgstr "土耳其料理"
@@ -26321,5 +26501,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "asian"
 msgstr "亞洲料理"
@@ -26327,5 +26507,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "thai"
 msgstr "泰式料理"
@@ -26333,5 +26513,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "mexican"
 msgstr "墨西哥料理"
@@ -26339,5 +26519,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "japanese"
 msgstr "日本料理"
@@ -26345,5 +26525,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "french"
 msgstr "法式料理"
@@ -26351,5 +26531,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sandwich"
 msgstr "三明治"
@@ -26357,5 +26537,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
 msgid "sushi"
 msgstr "壽司"
@@ -26363,10 +26543,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2084 build/trans_presets.java:2159
+#: build/trans_presets.java:2097 build/trans_presets.java:2172
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2111
 msgid "Fast Food"
 msgstr "速食"
@@ -26374,20 +26554,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2113
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2117
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2130
 msgid "Food Court"
 msgstr "美食街"
@@ -26395,10 +26575,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2132
 msgid "Edit Food Court"
 msgstr "編輯美食街"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2147
 msgid "Cafe"
 msgstr "咖啡"
@@ -26406,15 +26586,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2149
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2153
 msgid "ice_cream"
 msgstr "冰淇淋"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2166
 msgid "Pub"
 msgstr "酒店"
@@ -26422,20 +26602,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2168
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2185
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2186
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2201
 msgid "Bar"
 msgstr "酒吧"
@@ -26443,10 +26623,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2203
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2218
 msgid "Nightclub"
 msgstr "夜店"
@@ -26454,25 +26634,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2220
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
 #. group "Tourism"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2234
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2235
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2236
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2241
 msgid "Viewpoint"
 msgstr "景點"
@@ -26480,10 +26660,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2243
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2246
 msgid "Look-Out Tower"
 msgstr ""
@@ -26491,20 +26671,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2249
 msgid "Information Office"
 msgstr "資訊服務處"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2256
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "topo"
 msgstr ""
@@ -26537,5 +26717,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2248 build/trans_presets.java:4388
+#: build/trans_presets.java:2261 build/trans_presets.java:4401
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -26544,25 +26724,25 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2261
 msgid "scheme"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "Shown Area"
 msgstr "顯示區域"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "site"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "city"
 msgstr "城市"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2262
 msgid "region"
 msgstr "區"
@@ -26571,6 +26751,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2250 build/trans_presets.java:2266
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2263 build/trans_presets.java:2279
+#: build/trans_presets.java:2323
 msgid "Closer Description"
 msgstr ""
@@ -26580,5 +26760,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2252 build/trans_presets.java:2275
+#: build/trans_presets.java:2265 build/trans_presets.java:2288
 msgid "Routes shown for:"
 msgstr "路線顯示："
@@ -26586,5 +26766,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2253 build/trans_presets.java:2276
+#: build/trans_presets.java:2266 build/trans_presets.java:2289
 msgid "Hiking"
 msgstr "健走"
@@ -26593,6 +26773,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2254 build/trans_presets.java:2277
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2267 build/trans_presets.java:2290
+#: build/trans_presets.java:2840
 msgid "Cycling"
 msgstr "自行車"
@@ -26600,5 +26780,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2255 build/trans_presets.java:2278
+#: build/trans_presets.java:2268 build/trans_presets.java:2291
 msgid "Mountainbiking"
 msgstr ""
@@ -26607,6 +26787,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2256 build/trans_presets.java:2279
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2269 build/trans_presets.java:2292
+#: build/trans_presets.java:2888
 msgid "Skiing"
 msgstr "滑雪"
@@ -26614,5 +26794,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2257 build/trans_presets.java:2280
+#: build/trans_presets.java:2270 build/trans_presets.java:2293
 msgid "Riding"
 msgstr ""
@@ -26620,50 +26800,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2258 build/trans_presets.java:2281
+#: build/trans_presets.java:2271 build/trans_presets.java:2294
 msgid "... other transportation modes possible"
 msgstr "... 其他可能的運輸模式"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2273
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "Board Content"
 msgstr "板的內容"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "notice"
 msgstr "注意"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "history"
 msgstr "歷史"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "nature"
 msgstr "自然"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "wildlife"
 msgstr "野生"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2278
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2281
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2296
 msgid "Information Terminal"
 msgstr ""
@@ -26671,10 +26851,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2288 build/trans_presets.java:2298
+#: build/trans_presets.java:2301 build/trans_presets.java:2311
 msgid "Closer description"
 msgstr ""
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2306
 msgid "Audioguide"
 msgstr "語音導覽"
@@ -26682,25 +26862,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2316
 msgid "Audioguide via mobile phone?"
 msgstr "是否透過行動電話使用語音導覽？"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2317
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2319
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. group "Leisure"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2326
 msgid "Leisure"
 msgstr "休閒"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2327
 msgid "Cinema"
 msgstr "電影院"
@@ -26709,10 +26889,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2330
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2334
 msgid "Zoo"
 msgstr "動物園"
@@ -26721,10 +26901,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2337
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2343
 msgid "Dog Park"
 msgstr "狗狗公園"
@@ -26733,45 +26913,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2346
 msgid "Edit Dog Park"
 msgstr "編輯狗狗公園"
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "fence"
 msgstr "欄柵"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2350
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2354
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2355
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2360
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2361
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2365
 msgid "Sauna"
 msgstr "三溫暖"
@@ -26781,5 +26961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2353 build/trans_presets.java:2356
+#: build/trans_presets.java:2366 build/trans_presets.java:2369
 msgid "Edit Sauna"
 msgstr "編輯三溫暖"
@@ -26807,20 +26987,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2361 build/trans_presets.java:2472
-#: build/trans_presets.java:2593 build/trans_presets.java:3427
-#: build/trans_presets.java:3436 build/trans_presets.java:3453
-#: build/trans_presets.java:3462 build/trans_presets.java:3499
-#: build/trans_presets.java:3548 build/trans_presets.java:3571
-#: build/trans_presets.java:3580 build/trans_presets.java:3627
-#: build/trans_presets.java:3636 build/trans_presets.java:3664
-#: build/trans_presets.java:3673 build/trans_presets.java:3712
-#: build/trans_presets.java:3728 build/trans_presets.java:3737
-#: build/trans_presets.java:3746 build/trans_presets.java:3762
-#: build/trans_presets.java:3784 build/trans_presets.java:3799
+#: build/trans_presets.java:2374 build/trans_presets.java:2485
+#: build/trans_presets.java:2606 build/trans_presets.java:3440
+#: build/trans_presets.java:3449 build/trans_presets.java:3466
+#: build/trans_presets.java:3475 build/trans_presets.java:3512
+#: build/trans_presets.java:3561 build/trans_presets.java:3584
+#: build/trans_presets.java:3593 build/trans_presets.java:3640
+#: build/trans_presets.java:3649 build/trans_presets.java:3677
+#: build/trans_presets.java:3686 build/trans_presets.java:3725
+#: build/trans_presets.java:3741 build/trans_presets.java:3750
+#: build/trans_presets.java:3759 build/trans_presets.java:3775
+#: build/trans_presets.java:3797 build/trans_presets.java:3812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2375
 msgid "Access"
 msgstr ""
@@ -26828,5 +27008,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2378
 msgid "Playground"
 msgstr "運動場"
@@ -26834,15 +27014,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2380
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2384
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2385
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
@@ -26850,10 +27030,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2375 build/trans_presets.java:2702
+#: build/trans_presets.java:2388 build/trans_presets.java:2715
 msgid "Fireplace"
 msgstr "壁爐"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2390
 msgid "Public Grill"
 msgstr ""
@@ -26861,15 +27041,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2392
 msgid "Edit Public Grill"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2396
 msgid "Covered"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgctxt "grill"
 msgid "Fuel"
@@ -26877,30 +27057,30 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "charcoal"
 msgstr ""
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2397
 msgid "electric"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2399
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2400
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. group "Culture"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2405
 msgid "Culture"
 msgstr "文化"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2406
 msgid "Museum"
 msgstr "博物館"
@@ -26908,10 +27088,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2408
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2414
 msgid "Theatre"
 msgstr "劇院"
@@ -26920,10 +27100,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2417
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2421
 msgid "Library"
 msgstr "圖書館"
@@ -26932,10 +27112,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2424
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2429
 msgid "Arts Centre"
 msgstr "美術館"
@@ -26943,10 +27123,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2431
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2435
 msgid "Artwork"
 msgstr "藝術工作"
@@ -26954,10 +27134,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2437
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2441
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -26967,5 +27147,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2445
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -26974,6 +27154,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "Religion"
 msgstr "宗教"
@@ -26982,6 +27162,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "bahai"
 msgstr "巴海大同教"
@@ -26990,6 +27170,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "buddhist"
 msgstr "佛教"
@@ -26998,6 +27178,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "christian"
 msgstr "基督教系"
@@ -27006,6 +27186,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "hindu"
 msgstr "印度教"
@@ -27014,6 +27194,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jain"
 msgstr "耆那教"
@@ -27022,6 +27202,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "jewish"
 msgstr "猶太教"
@@ -27030,6 +27210,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "muslim"
 msgstr "回教"
@@ -27038,6 +27218,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "sikh"
 msgstr "錫克教"
@@ -27046,6 +27226,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "spiritualist"
 msgstr ""
@@ -27054,6 +27234,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "taoist"
 msgstr "道教"
@@ -27062,6 +27242,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "unitarian"
 msgstr ""
@@ -27070,6 +27250,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2435 build/trans_presets.java:4139
-#: build/trans_presets.java:4148
+#: build/trans_presets.java:2448 build/trans_presets.java:4152
+#: build/trans_presets.java:4161
 msgid "zoroastrian"
 msgstr "祆教"
@@ -27078,6 +27258,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "Denomination"
 msgstr "教派"
@@ -27086,6 +27266,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "anglican"
 msgstr "英國國教"
@@ -27094,6 +27274,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "baptist"
 msgstr "浸信會"
@@ -27102,6 +27282,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "catholic"
 msgstr "天主教"
@@ -27110,6 +27290,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "evangelical"
 msgstr "福音派教會"
@@ -27118,6 +27298,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jehovahs_witness"
 msgstr ""
@@ -27126,6 +27306,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "lutheran"
 msgstr "路德教派"
@@ -27134,6 +27314,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "methodist"
 msgstr "衛理公會教"
@@ -27142,6 +27322,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "mormon"
 msgstr "摩門教"
@@ -27150,6 +27330,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "orthodox"
 msgstr "東正教"
@@ -27158,6 +27338,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
@@ -27166,6 +27346,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "presbyterian"
 msgstr "長老派教會"
@@ -27174,6 +27354,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "protestant"
 msgstr "新教"
@@ -27182,6 +27362,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "quaker"
 msgstr "教友派"
@@ -27190,6 +27370,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "shia"
 msgstr "什葉派"
@@ -27198,38 +27378,36 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2436 build/trans_presets.java:4140
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "sunni"
 msgstr "遜尼派"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2437
-#, fuzzy
+#: build/trans_presets.java:2450
 msgid "Service Times"
-msgstr "休息站"
+msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 10:30"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2450
 msgid "Su 11:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Opening Hours for visiting"
-#: build/trans_presets.java:2438
-#, fuzzy
+#: build/trans_presets.java:2451
 msgid "Opening Hours for visiting"
-msgstr "開放時間"
+msgstr ""
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2453
 msgid "Recording Studio"
 msgstr "錄音室"
@@ -27237,15 +27415,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2455
 msgid "Edit Studio"
 msgstr "編輯錄音室"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "audio"
 msgstr "音樂"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2460
 msgid "video"
 msgstr "影片"
@@ -27253,5 +27431,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2452 build/trans_presets.java:2453
+#: build/trans_presets.java:2465 build/trans_presets.java:2466
 msgid "Public Building"
 msgstr "公共建築"
@@ -27259,10 +27437,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2468
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2472
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -27270,5 +27448,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2474
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
@@ -27277,10 +27455,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2465 build/trans_presets.java:2467
+#: build/trans_presets.java:2478 build/trans_presets.java:2480
 msgid "Community Centre"
 msgstr "活動中心"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2487
 msgid "Embassy"
 msgstr "大使館"
@@ -27288,10 +27466,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2489
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2493
 msgid "Courthouse"
 msgstr "法院"
@@ -27300,10 +27478,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2496
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2500
 msgid "Prison"
 msgstr "監獄"
@@ -27312,10 +27490,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2503
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2507
 msgid "Police"
 msgstr "警察局"
@@ -27325,10 +27503,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2511
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2515
 msgid "Fire Station"
 msgstr "消防隊"
@@ -27337,10 +27515,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2518
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2522
 msgid "Post Office"
 msgstr "郵局"
@@ -27348,25 +27526,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2524
 msgid "Edit Post Office"
 msgstr "編輯郵局"
 
 #. group "Education"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2530
 msgid "Education"
 msgstr "教育"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2531
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2532
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Education/School"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2536
 msgid "School"
 msgstr "學校"
@@ -27374,10 +27552,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2538
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Education/University"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2542
 msgid "University"
 msgstr "大學"
@@ -27385,10 +27563,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2544
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Education/College"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2548
 msgid "College"
 msgstr "學院"
@@ -27396,10 +27574,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2550
 msgid "Edit College"
 msgstr "編輯學院"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2554
 msgid "Driving School"
 msgstr "駕駛訓練學校"
@@ -27407,20 +27585,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2556
 msgid "Edit Driving School"
 msgstr "編輯駕駛訓練學校"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2561
 msgid "License Classes"
 msgstr "駕照類別"
 
 #. group "Health"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2564
 msgid "Health"
 msgstr "健康"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2565
 msgid "Hospital"
 msgstr "醫院"
@@ -27428,10 +27606,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2567
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2571
 msgid "Doctors"
 msgstr "醫師"
@@ -27439,33 +27617,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2573
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2578
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2579
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2571
-#, fuzzy
+#: build/trans_presets.java:2584
 msgid "Nursing Home"
-msgstr "編號規則"
+msgstr ""
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2572
-#, fuzzy
+#: build/trans_presets.java:2585
 msgid "Edit Nursing Home"
-msgstr "編輯行人穿越道"
+msgstr ""
 
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2591
 msgid "Pharmacy"
 msgstr "藥局"
@@ -27473,5 +27649,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2593
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -27479,10 +27655,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2595
 msgid "Dispensing"
 msgstr "配藥"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2599
 msgid "Hearing Aids"
 msgstr ""
@@ -27490,5 +27666,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2601
 msgid "Edit Hearing Aids"
 msgstr ""
@@ -27496,5 +27672,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2609
 msgid "Baby Hatch"
 msgstr "棄嬰保護艙"
@@ -27502,5 +27678,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2611
 msgid "Edit Baby Hatch"
 msgstr "編輯棄嬰保護艙"
@@ -27508,5 +27684,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2617
 msgid "Emergency Access Point"
 msgstr "緊急連絡點"
@@ -27515,5 +27691,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2620
 msgid "Edit Emergency Access Point"
 msgstr "編輯緊急連絡點"
@@ -27522,15 +27698,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2623
 msgid "Point Number"
 msgstr "連絡點編號"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2624
 msgid "Point Name"
 msgstr "連絡點名稱"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2627
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -27539,5 +27715,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2631
 msgid "Veterinary"
 msgstr "獸醫"
@@ -27546,10 +27722,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2634
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2648
 msgid "limited"
 msgstr ""
@@ -27557,15 +27733,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2636 build/trans_presets.java:3809
+#: build/trans_presets.java:2649 build/trans_presets.java:3822
 msgid "Note"
 msgstr ""
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2651
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2656
 msgid "Telephone"
 msgstr "電話"
@@ -27574,15 +27750,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2659
 msgid "Edit Telephone"
 msgstr "編輯電話"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2667
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2669
 msgid "Clock"
 msgstr "時鐘"
@@ -27591,5 +27767,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2672
 msgid "Edit Clock"
 msgstr "編輯時鐘"
@@ -27599,5 +27775,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgid "Display"
 msgstr "顯示"
@@ -27605,89 +27781,85 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "analog"
-msgstr "運河"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2662 build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:2675 build/trans_presets.java:3239
 msgctxt "display"
 msgid "digital"
-msgstr "數字"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "sundial"
-msgstr "印度料理"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2662
-#, fuzzy
+#: build/trans_presets.java:2675
 msgctxt "display"
 msgid "unorthodox"
-msgstr "東正教"
+msgstr ""
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "Support"
 msgstr "支援"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "pole"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "wall_mounted"
 msgstr "掛於牆上"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2676
 msgid "billboard"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "Visibility/readability"
 msgstr "能見度/可讀性"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 5m)"
 msgstr "(達 5 公尺)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(up to 20m)"
 msgstr "(達 20 公尺)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2677
 msgid "(more than 20m)"
 msgstr "(20 公尺以上)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2678
 msgid "Shows current date"
 msgstr "顯示目前的日期"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2679
 msgid "Shows temperature"
 msgstr "顯示溫度"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2680
 msgid "Shows barometric pressure"
 msgstr "顯示氣壓"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2681
 msgid "Shows humidity"
 msgstr "顯示溼度"
@@ -27695,5 +27867,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2684
 msgid "Recycling"
 msgstr "資源回收"
@@ -27702,5 +27874,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2687
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -27708,40 +27880,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2689
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2690
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2692
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2693
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2694
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2695
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2697
 msgid "Waste Basket"
 msgstr ""
@@ -27749,5 +27921,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2699
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27756,30 +27928,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2706
 msgid "Backrest"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "Material"
 msgstr "材質"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "stone"
 msgstr "石頭"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2707
 msgid "plastic"
 msgstr "塑膠"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "black"
@@ -27787,5 +27959,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "brown"
@@ -27793,5 +27965,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "green"
@@ -27799,5 +27971,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "red"
@@ -27805,5 +27977,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "blue"
@@ -27811,5 +27983,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "gray"
@@ -27817,5 +27989,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2708
 msgctxt "color"
 msgid "white"
@@ -27823,20 +27995,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2709
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2712
 msgid "Edit Shelter"
 msgstr "編輯涼亭"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgid "Type of shelter"
 msgstr ""
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -27844,5 +28016,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "public_transport"
@@ -27850,5 +28022,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -27856,5 +28028,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2716
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -27862,10 +28034,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2718
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2719
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27874,10 +28046,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2708 build/trans_presets.java:4000
+#: build/trans_presets.java:2721 build/trans_presets.java:4013
 msgid "Height"
 msgstr "高度"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -27885,20 +28057,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "half"
 msgstr "半高"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2721
 msgid "full"
 msgstr "全高"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2723
 msgid "Hide"
 msgstr "隱藏"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2724
 msgid "Lock"
 msgstr "鎖"
@@ -27906,5 +28078,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2727
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -27913,10 +28085,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2730
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2734
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -27925,5 +28097,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2737
 msgid "Edit Fire Hydrant"
 msgstr "編輯消防栓"
@@ -27931,5 +28103,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2726 build/trans_presets.java:3124
+#: build/trans_presets.java:2739 build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underground"
@@ -27937,5 +28109,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pillar"
@@ -27943,5 +28115,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "wall"
@@ -27949,5 +28121,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2739
 msgctxt "pipeline"
 msgid "pond"
@@ -27955,10 +28127,10 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2740
 msgid "Diameter"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "lane"
@@ -27966,5 +28138,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -27972,5 +28144,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27978,5 +28150,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2746
 msgctxt "hydrant position"
 msgid "green"
@@ -27984,20 +28156,20 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "Pressure"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "xx l/min"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2747
 msgid "suction"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2748
 msgid "Count"
 msgstr ""
@@ -28005,20 +28177,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2739 build/trans_presets.java:3514
+#: build/trans_presets.java:2752 build/trans_presets.java:3527
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2753
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2754
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2755
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -28032,6 +28204,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2764 build/trans_presets.java:2773
+#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "select sport:"
 msgstr "選擇運動："
@@ -28377,6 +28549,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -28414,6 +28586,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "multi"
 msgstr "多種"
@@ -28423,6 +28595,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "archery"
 msgstr "射箭"
@@ -28432,6 +28604,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "athletics"
 msgstr "田徑"
@@ -28441,6 +28613,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "american_football"
 msgstr "美式足球"
@@ -28450,6 +28622,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "australian_football"
 msgstr "澳洲足球"
@@ -28459,6 +28631,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "baseball"
 msgstr "棒球"
@@ -28468,6 +28640,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "basketball"
 msgstr "籃球"
@@ -28477,6 +28649,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "boules"
 msgstr ""
@@ -28486,6 +28658,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "bowls"
 msgstr "保齡球"
@@ -28495,6 +28667,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canadian_football"
 msgstr "加拿大足球"
@@ -28504,6 +28676,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "canoe"
 msgstr "獨木舟"
@@ -28513,6 +28685,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "climbing"
 msgstr "攀岩"
@@ -28522,6 +28694,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket"
 msgstr ""
@@ -28531,6 +28703,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cricket_nets"
 msgstr ""
@@ -28540,6 +28712,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "croquet"
 msgstr "木球"
@@ -28549,6 +28721,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "cycling"
 msgstr "自行車"
@@ -28558,6 +28730,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "dog_racing"
 msgstr "賽狗"
@@ -28567,6 +28739,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "equestrian"
 msgstr "馬術"
@@ -28576,6 +28748,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gaelic_football"
 msgstr ""
@@ -28585,6 +28757,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "golf"
 msgstr "高爾夫"
@@ -28594,6 +28766,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "gymnastics"
 msgstr "體操"
@@ -28603,6 +28775,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "hockey"
 msgstr "曲棍球"
@@ -28612,6 +28784,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "horse_racing"
 msgstr "賽馬"
@@ -28621,6 +28793,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "motor"
 msgstr "摩托車"
@@ -28630,6 +28802,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "pelota"
 msgstr ""
@@ -28639,6 +28811,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "racquet"
 msgstr ""
@@ -28648,6 +28820,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_league"
 msgstr ""
@@ -28657,6 +28829,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "rugby_union"
 msgstr ""
@@ -28666,6 +28838,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "shooting"
 msgstr "射擊"
@@ -28675,6 +28847,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skateboard"
 msgstr ""
@@ -28684,6 +28856,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skating"
 msgstr ""
@@ -28693,6 +28865,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "skiing"
 msgstr "滑雪"
@@ -28702,6 +28874,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "soccer"
 msgstr "足球"
@@ -28711,6 +28883,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "swimming"
 msgstr "游泳"
@@ -28720,6 +28892,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "table_tennis"
 msgstr "桌球"
@@ -28729,71 +28901,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2748 build/trans_presets.java:2757
-#: build/trans_presets.java:2766 build/trans_presets.java:2775
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
+#: build/trans_presets.java:2779 build/trans_presets.java:2788
 msgid "tennis"
 msgstr "網球"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2763
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2764
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2772
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2773
 msgid "Edit Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2781
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2782
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2790
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2791
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2796
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2797
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
 #. group "Sport"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2803
 msgid "Sport"
 msgstr "運動"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2804
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2805
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -28841,25 +29013,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "type"
 msgstr "類型"
@@ -28909,26 +29081,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "pitch"
 msgstr ""
@@ -28978,26 +29150,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
 #: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
 msgid "sports_centre"
 msgstr "運動中心"
@@ -29042,215 +29214,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2954
-#: build/trans_presets.java:2963 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050
 msgid "stadium"
 msgstr "競技揚"
 
-#. item "Sport/Multi" combo "type" display value
-#. item "Sport/10pin" combo "type" display value
-#. item "Sport/Athletics" combo "type" display value
-#. item "Sport/Archery" combo "type" display value
-#. item "Sport/Climbing" combo "type" display value
-#. item "Sport/Canoeing" combo "type" display value
-#. item "Sport/Cycling" combo "type" display value
-#. item "Sport/Dog Racing" combo "type" display value
-#. item "Sport/Equestrian" combo "type" display value
-#. item "Sport/Horse Racing" combo "type" display value
-#. item "Sport/Gymnastics" combo "type" display value
-#. item "Sport/Skating" combo "type" display value
-#. item "Sport/Skateboard" combo "type" display value
-#. item "Sport/Swimming" combo "type" display value
-#. item "Sport/Skiing" combo "type" display value
-#. item "Sport/Shooting" combo "type" display value
-#. item "Sport (Ball)/Soccer" combo "type" display value
-#. item "Sport (Ball)/Australian Football" combo "type" display value
-#. item "Sport (Ball)/American Football" combo "type" display value
-#. item "Sport (Ball)/Canadian Football" combo "type" display value
-#. item "Sport (Ball)/Gaelic Football" combo "type" display value
-#. item "Sport (Ball)/Rugby League" combo "type" display value
-#. item "Sport (Ball)/Rugby Union" combo "type" display value
-#. item "Sport (Ball)/Baseball" combo "type" display value
-#. item "Sport (Ball)/Basketball" combo "type" display value
-#. item "Sport (Ball)/Golf" combo "type" display value
-#. item "Sport (Ball)/Boule" combo "type" display value
-#. item "Sport (Ball)/Bowls" combo "type" display value
-#. item "Sport (Ball)/Cricket" combo "type" display value
-#. item "Sport (Ball)/Cricket Nets" combo "type" display value
-#. item "Sport (Ball)/Croquet" combo "type" display value
-#. item "Sport (Ball)/Hockey" combo "type" display value
-#. item "Sport (Ball)/Pelota" combo "type" display value
-#. item "Sport (Ball)/Racquet" combo "type" display value
-#. item "Sport (Ball)/Table Tennis" combo "type" display value
-#. item "Sport (Ball)/Tennis" combo "type" display value
-#. item "Motorsport/Motorsport" combo "type" display value
-#. item "Motorsport/Karting" combo "type" display value
-#. item "Motorsport/Motocross" combo "type" display value
-#. item "Motorsport/Safety Training" combo "type" display value
-#. item "Motorsport/Model Aerodrome" combo "type" display value
-#. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2795 build/trans_presets.java:2801
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-msgid "track"
-msgstr ""
-
 #. item "Sport/10pin"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2810
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2811
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2816
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2817
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2822
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2823
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2828
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2829
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2834
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2835
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2841
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2846
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2847
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2852
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2853
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2858
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2859
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2864
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2865
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2870
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2871
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2876
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2877
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2882
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2883
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -29258,60 +29364,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2890
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "downhill"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "nordic"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2893
 msgid "snow_park"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "novice"
 msgstr "新手"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "easy"
 msgstr "容易"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "advanced"
 msgstr "進階"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "expert"
 msgstr "專家"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2894
 msgid "freeride"
 msgstr ""
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2897
 msgid "Shooting"
 msgstr "射擊"
@@ -29319,105 +29425,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2899
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2905
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2906
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2907
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2912
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2913
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2918
 msgid "American Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2919
 msgid "Edit American Football"
 msgstr "編輯美式足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2924
 msgid "Canadian Football"
 msgstr "加拿大足球"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2925
 msgid "Edit Canadian Football"
 msgstr "編輯加拿大足球"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2930
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2931
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2936
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2937
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2942
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2943
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2948
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2949
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2954
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2955
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2960
 msgid "Volleyball"
 msgstr "排球"
@@ -29425,10 +29531,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2962
 msgid "Edit Volleyball"
 msgstr "編輯排球"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2969
 msgid "Beachvolleyball"
 msgstr "沙灘排球"
@@ -29436,120 +29542,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2971
 msgid "Edit Beachvolleyball"
 msgstr "編輯沙灘排球"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2978
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2979
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2982
 msgid "golf_course"
 msgstr "高爾夫路線"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2984
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2985
 msgid "Edit Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2990
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2991
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2996
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2997
 msgid "Edit Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3002
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3003
 msgid "Edit Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3008
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3009
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3014
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3015
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3020
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3021
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3026
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3027
 msgid "Edit Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3032
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3033
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3038
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3039
 msgid "Edit Tennis"
 msgstr "編輯網路"
@@ -29557,40 +29663,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:3032 build/trans_presets.java:3033
+#: build/trans_presets.java:3045 build/trans_presets.java:3046
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3047
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3052
 msgid "Karting"
 msgstr "卡丁車"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3053
 msgid "Edit Karting"
 msgstr "編輯卡丁車"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3058
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3059
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3064
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3065
 msgid "Edit Safety Training"
 msgstr ""
@@ -29598,20 +29704,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3071
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3072
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3077
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3078
 msgid "Edit RC Car"
 msgstr ""
@@ -29619,10 +29725,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:3072 build/trans_presets.java:3073
+#: build/trans_presets.java:3085 build/trans_presets.java:3086
 msgid "Man Made"
 msgstr "人造物"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3087
 msgid "Building"
 msgstr "建築物"
@@ -29630,25 +29736,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3090
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3091
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "Tower type"
 msgstr "塔類型"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "communication"
 msgstr "通訊"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3094
 msgid "observation"
 msgstr "觀測"
@@ -29657,5 +29763,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:3083 build/trans_presets.java:3104
+#: build/trans_presets.java:3096 build/trans_presets.java:3117
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -29663,5 +29769,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3100
 msgid "Flagpole"
 msgstr ""
@@ -29671,15 +29777,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3105
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3106
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3110
 msgid "Chimney"
 msgstr ""
@@ -29687,10 +29793,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3112
 msgid "Edit Chimney"
 msgstr ""
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3119
 msgid "Windmill"
 msgstr "風車"
@@ -29698,20 +29804,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3121
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3125
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3126
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3130
 msgid "Pipeline"
 msgstr "油管"
@@ -29720,5 +29826,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3133
 msgid "Edit Pipeline"
 msgstr "編輯油管"
@@ -29762,5 +29868,5 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:3123 build/trans_style.java:817
+#: build/trans_presets.java:3136 build/trans_style.java:817
 #: build/trans_style.java:830 build/trans_style.java:842
 #: build/trans_style.java:847 build/trans_style.java:2936
@@ -29773,10 +29879,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "gas"
 msgstr "天然氣"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "heat"
 msgstr ""
@@ -29784,20 +29890,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3123 build/trans_presets.java:3250
+#: build/trans_presets.java:3136 build/trans_presets.java:3263
 msgid "oil"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:3136
 msgid "sewage"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgid "Location"
 msgstr "位置"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "underwater"
@@ -29805,5 +29911,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3137
 msgctxt "pipeline"
 msgid "overground"
@@ -29811,5 +29917,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3139
 msgid "Crane"
 msgstr "起重機"
@@ -29817,10 +29923,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3141
 msgid "Edit Crane"
 msgstr "編輯起重機"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3145
 msgid "Mineshaft"
 msgstr ""
@@ -29829,25 +29935,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3148
 msgid "Edit Mineshaft"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "Function"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "winding"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3151
 msgid "air"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3152
 msgid "Depth in meters"
 msgstr "深度（公尺）"
@@ -29855,5 +29961,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "Resource"
 msgstr ""
@@ -29861,5 +29967,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "aggregate"
 msgstr ""
@@ -29867,5 +29973,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "bauxite"
 msgstr ""
@@ -29874,6 +29980,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3263
 msgid "coal"
 msgstr "燃媒"
@@ -29881,5 +29987,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "copper"
 msgstr ""
@@ -29887,5 +29993,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "dimension_stone"
 msgstr ""
@@ -29893,5 +29999,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "gold"
 msgstr ""
@@ -29899,5 +30005,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "ilmenite"
 msgstr ""
@@ -29905,5 +30011,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "iron_ore"
 msgstr ""
@@ -29911,5 +30017,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "lead"
 msgstr ""
@@ -29917,5 +30023,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "limestone"
 msgstr ""
@@ -29923,5 +30029,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "nickel"
 msgstr ""
@@ -29929,5 +30035,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "rutile"
 msgstr ""
@@ -29935,5 +30041,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "salt"
 msgstr ""
@@ -29941,5 +30047,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "silver"
 msgstr ""
@@ -29947,5 +30053,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "tin"
 msgstr ""
@@ -29953,5 +30059,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zinc"
 msgstr ""
@@ -29959,10 +30065,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
 msgid "zircon"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3155
 msgid "Visible Headframe"
 msgstr ""
@@ -29970,10 +30076,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:3143 build/trans_presets.java:3153
+#: build/trans_presets.java:3156 build/trans_presets.java:3166
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3158
 msgid "Adit"
 msgstr ""
@@ -29981,10 +30087,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3160
 msgid "Edit Adit"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3163
 msgid "Length in meters"
 msgstr ""
@@ -29992,15 +30098,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3169
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3170
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3174
 msgid "Water Works"
 msgstr "水工廠"
@@ -30008,10 +30114,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3176
 msgid "Edit Water Works"
 msgstr "編輯水工廠"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3182
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -30021,10 +30127,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3186
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3190
 msgid "Watermill"
 msgstr "水車"
@@ -30032,10 +30138,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:3192
 msgid "Edit Watermill"
 msgstr "編輯水車"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3197
 msgid "Fountain"
 msgstr "噴泉"
@@ -30044,10 +30150,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3200
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3204
 msgid "Water Well"
 msgstr "水井"
@@ -30055,5 +30161,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3206
 msgid "Edit Water Well"
 msgstr "編輯水井"
@@ -30061,5 +30167,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3211
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -30067,5 +30173,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3213
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
@@ -30073,10 +30179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3219
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3223
 msgid "Street Lamp"
 msgstr "路燈"
@@ -30084,5 +30190,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3225
 msgid "Edit Street Lamp"
 msgstr "編輯路燈"
@@ -30091,15 +30197,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Operation times"
 msgstr "運作時間"
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3228
 msgid "Mo-Fr 22:00-05:00"
 msgstr "週一-週五 22:00-05:00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3230
 msgid "Measurement Station"
 msgstr "觀測站"
@@ -30107,62 +30213,61 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3232
 msgid "Edit Measurement Station"
 msgstr "編輯觀測站"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "Measurement"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "particulate_matter"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "seismic"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "water_level"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3237
 msgid "weather"
 msgstr "天氣"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "Recording"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "manually"
 msgstr "手動"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "automated"
 msgstr "自動"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3238
 msgid "remote"
 msgstr "遙控"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3226
-#, fuzzy
+#: build/trans_presets.java:3239
 msgctxt "display"
 msgid "no"
-msgstr "否"
+msgstr ""
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3241
 msgid "Survey Point"
 msgstr "測量點"
@@ -30170,10 +30275,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3243
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3247
 msgid "Surveillance"
 msgstr "監視"
@@ -30181,30 +30286,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3249
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "indoor"
 msgstr "室內"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "outdoor"
 msgstr "戶外"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3252
 msgid "public"
 msgstr "公開"
 
 #. group "Power"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3255
 msgid "Power"
 msgstr "電力"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3256
 msgid "Power Generator"
 msgstr "發電廠"
@@ -30214,146 +30319,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3260
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biofuel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biogas"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "biomass"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "diesel"
-msgstr "柴油"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "gasoline"
-msgstr "上線"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "geothermal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "hydro"
 msgstr "水力"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "nuclear"
 msgstr "核能"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
-#, fuzzy
+#: build/trans_presets.java:3263
 msgid "osmotic"
-msgstr "注意"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "solar"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "tidal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "waste"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wave"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3263
 msgid "wind"
 msgstr "風力"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "anaerobic_digestion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "combustion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "dam"
-msgstr "水壩"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "fission"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "fusion"
-msgstr "版本"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "gasification"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
-#, fuzzy
+#: build/trans_presets.java:3264
 msgid "pumping"
-msgstr "露營"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "pyrolysis"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "run-of-the-river"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3264
 msgid "thermal"
 msgstr ""
@@ -30361,13 +30460,12 @@
 #. <space />
 #. item "Power/Power Generator" label "Output forms of energy"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3266
 msgid "Output forms of energy"
 msgstr ""
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3254
-#, fuzzy
+#: build/trans_presets.java:3267
 msgid "electricity"
-msgstr "電子"
+msgstr ""
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30380,9 +30478,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "2 W"
 msgstr ""
@@ -30397,9 +30495,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "3 kW"
 msgstr ""
@@ -30414,9 +30512,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "5 MW"
 msgstr ""
@@ -30431,56 +30529,54 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3254 build/trans_presets.java:3255
-#: build/trans_presets.java:3256 build/trans_presets.java:3257
-#: build/trans_presets.java:3258 build/trans_presets.java:3259
-#: build/trans_presets.java:3260 build/trans_presets.java:3261
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267 build/trans_presets.java:3268
+#: build/trans_presets.java:3269 build/trans_presets.java:3270
+#: build/trans_presets.java:3271 build/trans_presets.java:3272
+#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "7 GW"
 msgstr ""
 
 #. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3255
-#, fuzzy
+#: build/trans_presets.java:3268
 msgid "hot water"
-msgstr "水域"
+msgstr ""
 
 #. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3269
 msgid "hot air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3257
-#, fuzzy
+#: build/trans_presets.java:3270
 msgid "cold water"
-msgstr "水域"
+msgstr ""
 
 #. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3271
 msgid "cold air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3272
 msgid "compressed air"
 msgstr ""
 
 #. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3273
 msgid "steam"
 msgstr ""
 
 #. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3274
 msgid "vacuum"
 msgstr ""
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3275
 msgid "battery charging"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3277
 msgid "Power Station"
 msgstr "發電廠"
@@ -30489,10 +30585,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3280
 msgid "Edit Power Station"
 msgstr "編輯發電廠"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3286
 msgid "Power Sub Station"
 msgstr ""
@@ -30501,5 +30597,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3289
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -30507,10 +30603,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3279 build/trans_presets.java:3312
+#: build/trans_presets.java:3292 build/trans_presets.java:3325
 msgid "Line reference"
 msgstr ""
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3294
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30519,5 +30615,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3297
 msgid "Edit Cable Distribution Cabinet"
 msgstr ""
@@ -30525,5 +30621,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3303
 msgid "Power Tower"
 msgstr "電塔"
@@ -30534,5 +30630,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3295
+#: build/trans_presets.java:3308
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
@@ -30540,10 +30636,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3310
 msgid "Tower reference"
 msgstr ""
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3312
 msgid "Pole"
 msgstr ""
@@ -30552,5 +30648,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:3315
 msgid "Edit Power Pole"
 msgstr ""
@@ -30558,10 +30654,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:3317
 msgid "Pole reference"
 msgstr ""
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3319
 msgid "Power Line"
 msgstr "電線"
@@ -30570,15 +30666,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3322
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgid "Line type"
 msgstr "電線類型"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "line"
@@ -30586,5 +30682,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3323
 msgctxt "Power Line"
 msgid "minor_line"
@@ -30592,40 +30688,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3328
 msgid "Amount of Cables"
 msgstr "纜線數量"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "single"
 msgstr "單線"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "double"
 msgstr "雙線"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "triple"
 msgstr "三線"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3329
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3332
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3320
+#: build/trans_presets.java:3333
 msgid "Castle"
 msgstr "城堡"
@@ -30634,20 +30730,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3336
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3341
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3342
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3347
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -30656,10 +30752,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3337
+#: build/trans_presets.java:3350
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3355
 msgid "Battlefield"
 msgstr "戰場"
@@ -30667,10 +30763,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3344
+#: build/trans_presets.java:3357
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3361
 msgid "Palaeontological Site"
 msgstr ""
@@ -30678,5 +30774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3363
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -30684,15 +30780,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3368
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3369
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3373
 msgid "Memorial"
 msgstr "紀念碑"
@@ -30700,60 +30796,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3375
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3379
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3380
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3371
+#: build/trans_presets.java:3384
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3385
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3376
+#: build/trans_presets.java:3389
 msgid "Boundary Stone"
 msgstr "邊界石"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3377
+#: build/trans_presets.java:3390
 msgid "Edit Boundary Stone"
 msgstr "編輯邊界石"
 
 #. group "Shops"
-#: build/trans_presets.java:3383
+#: build/trans_presets.java:3396
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3397
 msgid "Food"
 msgstr "食物"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3398
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3399
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3391
+#: build/trans_presets.java:3404
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -30761,10 +30857,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3406
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3411
 msgid "Kiosk"
 msgstr ""
@@ -30772,5 +30868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3400
+#: build/trans_presets.java:3413
 msgid "Edit Kiosk"
 msgstr ""
@@ -30778,5 +30874,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3419
 msgid "Baker"
 msgstr "麵包類"
@@ -30784,10 +30880,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3421
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3426
 msgid "Butcher"
 msgstr "肉類"
@@ -30795,10 +30891,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3415
+#: build/trans_presets.java:3428
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:3433
 msgid "Seafood"
 msgstr "海產"
@@ -30806,10 +30902,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3435
 msgid "Edit Seafood"
 msgstr "編輯海產"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3442
 msgid "Deli (Fine Food)"
 msgstr ""
@@ -30817,10 +30913,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3444
 msgid "Edit Deli (Fine Food)"
 msgstr ""
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3451
 msgid "Confectionery"
 msgstr ""
@@ -30828,5 +30924,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3453
 msgid "Edit Confectionery"
 msgstr ""
@@ -30834,5 +30930,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3459
 msgid "Marketplace"
 msgstr "市場"
@@ -30840,10 +30936,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3461
 msgid "Edit Marketplace"
 msgstr "編輯市場"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3468
 msgid "Greengrocer"
 msgstr ""
@@ -30851,15 +30947,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:3470
 msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3477
 msgid "Organic"
 msgstr "有機產品"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3465
+#: build/trans_presets.java:3478
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
@@ -30867,5 +30963,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3471
+#: build/trans_presets.java:3484
 msgid "Alcohol"
 msgstr "酒類"
@@ -30873,25 +30969,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3486
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3491
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3492
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3487
+#: build/trans_presets.java:3500
 msgid "Edit Clothes Shop"
 msgstr "編輯服裝店"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3505
 msgid "Boutique"
 msgstr ""
@@ -30899,20 +30995,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3494
+#: build/trans_presets.java:3507
 msgid "Edit Boutique"
 msgstr ""
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3514
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:3515
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3520
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -30920,10 +31016,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3522
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3528
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
@@ -30931,5 +31027,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3534
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -30937,10 +31033,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3536
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3541
 msgid "Laundry"
 msgstr "洗衣店"
@@ -30948,20 +31044,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3530
+#: build/trans_presets.java:3543
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3548
 msgid "Tailor"
 msgstr ""
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3549
 msgid "Edit Tailor"
 msgstr ""
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3554
 msgid "Fabric"
 msgstr ""
@@ -30969,35 +31065,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3556
 msgid "Edit Fabric"
 msgstr ""
 
 #. group "Electronic"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3564
 msgid "Electronic"
 msgstr "電子"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:3565
 msgid "Computer"
 msgstr "電腦類"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3566
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:3571
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3572
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3577
 msgid "Mobile Phone"
 msgstr "行動電話"
@@ -31005,10 +31101,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3579
 msgid "Edit Mobile Phone"
 msgstr "編輯行動電話"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3586
 msgid "Vacuum Cleaner"
 msgstr "吸塵器"
@@ -31016,35 +31112,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3575
+#: build/trans_presets.java:3588
 msgid "Edit Vacuum Cleaner"
 msgstr "編輯吸塵器"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:3595
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3596
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3601
 msgid "Video"
 msgstr "影片類"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3602
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
 #. group "Cash"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3608
 msgid "Cash"
 msgstr "現金"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3609
 msgid "Bank"
 msgstr "銀行"
@@ -31052,5 +31148,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3611
 msgid "Edit Bank"
 msgstr "編輯銀行"
@@ -31058,10 +31154,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3603 build/trans_presets.java:3612
+#: build/trans_presets.java:3616 build/trans_presets.java:3625
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3605
+#: build/trans_presets.java:3618
 msgid "Money Exchange"
 msgstr "金錢兌換所"
@@ -31069,5 +31165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:3620
 msgid "Edit Money Exchange"
 msgstr "編輯金錢兌換所"
@@ -31075,10 +31171,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:3627
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:3633
 msgid "Department Store"
 msgstr "百貨公司"
@@ -31086,10 +31182,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3622
+#: build/trans_presets.java:3635
 msgid "Edit Department Store"
 msgstr "編輯百貨公司"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3629
+#: build/trans_presets.java:3642
 msgid "Mall"
 msgstr "購物中心"
@@ -31097,5 +31193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3644
 msgid "Edit Mall"
 msgstr "編輯購物中心"
@@ -31103,35 +31199,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3639
+#: build/trans_presets.java:3652
 msgid "Chemist"
 msgstr ""
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3653
 msgid "Edit Chemist"
 msgstr ""
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3645
+#: build/trans_presets.java:3658
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3659
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3664
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3665
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:3670
 msgid "Jewelry"
 msgstr "珠寶"
@@ -31139,10 +31235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3672
 msgid "Edit Jewelry"
 msgstr "編輯珠寶"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3679
 msgid "Erotic"
 msgstr "情趣用品"
@@ -31150,5 +31246,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3681
 msgid "Edit Erotic"
 msgstr "編輯情趣用品"
@@ -31156,5 +31252,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3689
 msgid "Florist"
 msgstr "花類"
@@ -31162,10 +31258,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3678
+#: build/trans_presets.java:3691
 msgid "Edit Florist"
 msgstr "編輯花店"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3696
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -31173,5 +31269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3698
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
@@ -31179,5 +31275,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:3704
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -31185,10 +31281,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:3706
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3711
 msgid "Hardware"
 msgstr "硬體"
@@ -31196,10 +31292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:3713
 msgid "Edit Hardware Store"
 msgstr "編輯硬體商店"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3705
+#: build/trans_presets.java:3718
 msgid "Paint"
 msgstr ""
@@ -31207,5 +31303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3707
+#: build/trans_presets.java:3720
 msgid "Edit Paint"
 msgstr ""
@@ -31213,15 +31309,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3715
+#: build/trans_presets.java:3728
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3716
+#: build/trans_presets.java:3729
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3721
+#: build/trans_presets.java:3734
 msgid "Kitchen"
 msgstr "廚房"
@@ -31229,10 +31325,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3723
+#: build/trans_presets.java:3736
 msgid "Edit Kitchen"
 msgstr "編輯廚房"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3730
+#: build/trans_presets.java:3743
 msgid "Curtain"
 msgstr ""
@@ -31240,10 +31336,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3745
 msgid "Edit Curtain"
 msgstr ""
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3752
 msgid "Frame"
 msgstr ""
@@ -31251,5 +31347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3754
 msgid "Edit Frames"
 msgstr ""
@@ -31257,15 +31353,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3762
 msgid "Stationery"
 msgstr "文具類"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:3763
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3768
 msgid "Copyshop"
 msgstr ""
@@ -31273,15 +31369,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3757
+#: build/trans_presets.java:3770
 msgid "Edit Copyshop"
 msgstr ""
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3764
+#: build/trans_presets.java:3777
 msgid "Book Store"
 msgstr "書店"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3765
+#: build/trans_presets.java:3778
 msgid "Edit Book Store"
 msgstr "編輯書店"
@@ -31289,15 +31385,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3771
+#: build/trans_presets.java:3784
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3785
 msgid "Edit Travel Agency"
 msgstr "編輯旅行社"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3790
 msgid "Musical Instrument"
 msgstr "樂器"
@@ -31305,20 +31401,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3779
+#: build/trans_presets.java:3792
 msgid "Edit Musical Instruments"
 msgstr "編輯樂器"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3786
+#: build/trans_presets.java:3799
 msgid "Toys"
 msgstr "玩具類"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3787
+#: build/trans_presets.java:3800
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:3805
 msgid "Variety Store"
 msgstr ""
@@ -31326,10 +31422,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:3807
 msgid "Edit Variety Store"
 msgstr ""
 
 #. item "Vending machine"
-#: build/trans_presets.java:3802
+#: build/trans_presets.java:3815
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -31337,5 +31433,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3817
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -31343,180 +31439,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_tickets"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "public_transport_plans"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "parking_tickets"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "food"
 msgstr "食物"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "drinks"
 msgstr "飲料"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "sweets"
 msgstr "甜點"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "cigarettes"
 msgstr "菸"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "photos"
 msgstr "相片"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "animal_food"
 msgstr "飼料"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "news_papers"
 msgstr "報紙"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "toys"
 msgstr "玩具"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "stamps"
 msgstr "郵票"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "telephone_vouchers"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "vouchers"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "bicycle_tube"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "condoms"
 msgstr "保險套"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "tampons"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3819
 msgid "excrement_bags"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3818 build/trans_presets.java:3942
+#: build/trans_presets.java:3831 build/trans_presets.java:3955
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3832
 msgid "Boundaries"
 msgstr "邊界"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3833
 msgid "National"
 msgstr "國界"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3821
+#: build/trans_presets.java:3834
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:3839
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:3840
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3845
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3846
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:3851
 msgid "Political"
 msgstr "政治的"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3852
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3844
+#: build/trans_presets.java:3857
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3858
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. group "Places"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3864
 msgid "Places"
 msgstr "地名"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3865
 msgid "Continent"
 msgstr "洲"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3853
+#: build/trans_presets.java:3866
 msgid "Edit Continent"
 msgstr "編輯洲"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:3872
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31524,10 +31620,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3860
+#: build/trans_presets.java:3873
 msgid "Edit Country"
 msgstr "編輯國家"
 
 #. item "Places/State"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3879
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31535,25 +31631,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3867
+#: build/trans_presets.java:3880
 msgid "Edit State"
 msgstr "編輯州"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3886
 msgid "Region"
 msgstr "區"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:3887
 msgid "Edit Region"
 msgstr "編輯區"
 
 #. item "Places/County"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3893
 msgid "County"
 msgstr "縣"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:3894
 msgid "Edit County"
 msgstr "編輯縣"
@@ -31561,5 +31657,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3888
+#: build/trans_presets.java:3901
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -31568,10 +31664,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:3902
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:3908
 msgid "Town"
 msgstr "鄉/鎮"
@@ -31579,10 +31675,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3897
+#: build/trans_presets.java:3910
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:3916
 msgid "Suburb"
 msgstr "郊區"
@@ -31590,42 +31686,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3905
+#: build/trans_presets.java:3918
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3911
+#: build/trans_presets.java:3924
 msgid "Village"
 msgstr "村/里"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3912
+#: build/trans_presets.java:3925
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3931
 msgid "Hamlet"
 msgstr ""
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3919
+#: build/trans_presets.java:3932
 msgid "Edit Hamlet"
 msgstr ""
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3938
 msgid "Isolated Dwelling"
 msgstr ""
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3926
-#, fuzzy
+#: build/trans_presets.java:3939
 msgid "Edit Isolated Dwelling"
-msgstr "編輯水井"
+msgstr ""
 
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:3946
 msgid "Locality"
 msgstr ""
@@ -31633,10 +31728,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3935
+#: build/trans_presets.java:3948
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3943
+#: build/trans_presets.java:3956
 msgid "Peak"
 msgstr "峰"
@@ -31644,10 +31739,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3945
+#: build/trans_presets.java:3958
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:3964
 msgid "Glacier"
 msgstr "冰河"
@@ -31655,10 +31750,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:3966
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:3972
 msgid "Volcano"
 msgstr "火山"
@@ -31666,10 +31761,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3961
+#: build/trans_presets.java:3974
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3967
+#: build/trans_presets.java:3980
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -31677,5 +31772,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3969
+#: build/trans_presets.java:3982
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
@@ -31683,5 +31778,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3975
+#: build/trans_presets.java:3988
 msgid "Island"
 msgstr "島嶼"
@@ -31689,10 +31784,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:3990
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:3996
 msgid "Islet"
 msgstr "小島"
@@ -31700,15 +31795,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:3998
 msgid "Edit Islet"
 msgstr "編輯小島"
 
 #. group "Nature"
-#: build/trans_presets.java:3992
+#: build/trans_presets.java:4005
 msgid "Nature"
 msgstr "自然"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3993
+#: build/trans_presets.java:4006
 msgid "Tree"
 msgstr "樹"
@@ -31717,15 +31812,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:4009
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4014
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4003
+#: build/trans_presets.java:4016
 msgid "Wood"
 msgstr "樹林"
@@ -31734,10 +31829,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4019
 msgid "Edit Wood"
 msgstr "編輯樹林"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "coniferous"
@@ -31745,5 +31840,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "deciduous"
@@ -31751,5 +31846,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4022
 msgctxt "wood"
 msgid "mixed"
@@ -31757,5 +31852,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4011
+#: build/trans_presets.java:4024
 msgid "Forest"
 msgstr "森林"
@@ -31764,30 +31859,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4027
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "coniferous"
 msgstr "松類"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "deciduous"
 msgstr "落葉類"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4018
+#: build/trans_presets.java:4031
 msgid "mixed"
 msgstr "混合"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4020
+#: build/trans_presets.java:4033
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4034
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -31795,15 +31890,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:4039
 msgid "Scree"
 msgstr ""
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4040
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4044
 msgid "Fell"
 msgstr ""
@@ -31811,20 +31906,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4046
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4037
+#: build/trans_presets.java:4050
 msgid "Scrub"
 msgstr ""
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4038
+#: build/trans_presets.java:4051
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4042
+#: build/trans_presets.java:4055
 msgid "Heath"
 msgstr ""
@@ -31832,15 +31927,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4057
 msgid "Edit Heath"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:4049
+#: build/trans_presets.java:4062
 msgid "Land use"
 msgstr "土地利用"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4063
 msgid "Farmyard"
 msgstr "農家庭院"
@@ -31849,40 +31944,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4066
 msgid "Edit Farmyard Landuse"
 msgstr "編輯農家庭院"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4058
+#: build/trans_presets.java:4071
 msgid "Farmland"
 msgstr "農田"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4059
+#: build/trans_presets.java:4072
 msgid "Edit Farmland Landuse"
 msgstr "編輯農田土地利用"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4077
 msgid "Meadow"
 msgstr "青草地"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4065
+#: build/trans_presets.java:4078
 msgid "Edit Meadow Landuse"
 msgstr "編輯青草地土地利用"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4083
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4084
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4076
+#: build/trans_presets.java:4089
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31890,15 +31985,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4091
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4097
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:4098
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -31906,25 +32001,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4104
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4105
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4109
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4110
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4102
+#: build/trans_presets.java:4115
 msgid "Village Green"
 msgstr ""
@@ -31932,10 +32027,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4117
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4122
 msgid "Common"
 msgstr ""
@@ -31943,20 +32038,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4111
+#: build/trans_presets.java:4124
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4128
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4116
+#: build/trans_presets.java:4129
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4133
 msgid "Recreation Ground"
 msgstr ""
@@ -31964,5 +32059,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4135
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -31970,15 +32065,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4141
 msgid "Residential area"
 msgstr "住宅區"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4142
 msgid "Edit Residential Landuse"
 msgstr "編輯住宅區土地利用"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4147
 msgid "Graveyard"
 msgstr ""
@@ -31986,10 +32081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4136
+#: build/trans_presets.java:4149
 msgid "Edit Graveyard"
 msgstr ""
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4155
 msgid "Cemetery"
 msgstr ""
@@ -31997,40 +32092,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4157
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4151
+#: build/trans_presets.java:4164
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4152
+#: build/trans_presets.java:4165
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4170
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4158
+#: build/trans_presets.java:4171
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4176
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4177
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4182
 msgid "Garages"
 msgstr ""
@@ -32038,10 +32133,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4184
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4190
 msgid "Railway land"
 msgstr ""
@@ -32049,15 +32144,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4192
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4197
 msgid "Military"
 msgstr "軍事"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4185
+#: build/trans_presets.java:4198
 msgid "Edit Military Landuse"
 msgstr ""
@@ -32065,55 +32160,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4191
+#: build/trans_presets.java:4204
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4205
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4210
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4211
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4203
+#: build/trans_presets.java:4216
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4217
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4209
+#: build/trans_presets.java:4222
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4223
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4215
+#: build/trans_presets.java:4228
 msgid "Quarry"
 msgstr "露天採礦"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4229
 msgid "Edit Quarry Landuse"
 msgstr "編輯露天採礦土地利用"
 
 #. group "Annotation"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4236
 msgid "Annotation"
 msgstr ""
@@ -32121,5 +32216,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4224
+#: build/trans_presets.java:4237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -32130,5 +32225,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4227
+#: build/trans_presets.java:4240
 msgid "Edit Address Information"
 msgstr "編輯地址資訊"
@@ -32136,5 +32231,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4242
 msgid "House number"
 msgstr "門牌號碼"
@@ -32142,5 +32237,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4231
+#: build/trans_presets.java:4244
 msgid "House name"
 msgstr "房屋名稱"
@@ -32149,55 +32244,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4232 build/trans_presets.java:4386
+#: build/trans_presets.java:4245 build/trans_presets.java:4399
 msgid "Street name"
 msgstr "街道名稱"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4233
+#: build/trans_presets.java:4246
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4234
+#: build/trans_presets.java:4247
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "Country code"
 msgstr "國碼"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "AT"
 msgstr "AT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "CH"
 msgstr "CH"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "DE"
 msgstr "DE"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "FR"
 msgstr "FR"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "GB"
 msgstr "GB"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "IT"
 msgstr "IT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4235
+#: build/trans_presets.java:4248
 msgid "US"
 msgstr "US"
@@ -32205,5 +32300,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4238
+#: build/trans_presets.java:4251
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -32215,5 +32310,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4241
+#: build/trans_presets.java:4254
 msgid "Edit Address Interpolation"
 msgstr "編輯地址填寫"
@@ -32221,35 +32316,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "odd"
 msgstr "奇數"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "even"
 msgstr "偶數"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4243
+#: build/trans_presets.java:4256
 msgid "alphabetic"
 msgstr "按字母順序"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4245
+#: build/trans_presets.java:4258
 msgid "Contact"
 msgstr "連絡"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4259
 msgid "Edit Contact information"
 msgstr "編輯連絡資訊"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4255
+#: build/trans_presets.java:4268
 msgid "Image"
 msgstr "圖片"
@@ -32259,5 +32354,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4263
+#: build/trans_presets.java:4276
 msgid "Edit Multipolygon"
 msgstr "編輯多重多邊形"
@@ -32269,5 +32364,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4269 build/trans_presets.java:4286
+#: build/trans_presets.java:4282 build/trans_presets.java:4299
 msgid "outer segment"
 msgstr "外部區段"
@@ -32275,5 +32370,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4270 build/trans_presets.java:4287
+#: build/trans_presets.java:4283 build/trans_presets.java:4300
 msgid "inner segment"
 msgstr "內部區段"
@@ -32281,5 +32376,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4273
+#: build/trans_presets.java:4286
 msgid "Boundary"
 msgstr "邊界"
@@ -32290,5 +32385,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4278
+#: build/trans_presets.java:4291
 msgid "Edit Boundary"
 msgstr "編輯邊界"
@@ -32296,40 +32391,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "Boundary type"
 msgstr "邊界類型"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "administrative"
 msgstr "行政區"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "national"
 msgstr "國界"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "civil"
 msgstr "城市的"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4282
+#: build/trans_presets.java:4295
 msgid "political"
 msgstr "政治的"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4283
+#: build/trans_presets.java:4296
 msgid "Administrative level"
 msgstr "行政層級"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4288
+#: build/trans_presets.java:4301
 msgid "Sub area"
 msgstr "子區域"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4289
+#: build/trans_presets.java:4302
 msgid "Administration centre"
 msgstr "行政中心"
@@ -32337,5 +32432,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4292
+#: build/trans_presets.java:4305
 msgid "Turn restriction"
 msgstr "轉彎限制"
@@ -32344,5 +32439,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4308
 msgid "Edit Turn Restriction"
 msgstr "編輯轉彎限制"
@@ -32350,40 +32445,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "Restriction"
 msgstr "限制"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_left_turn"
 msgstr "禁止左轉"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_right_turn"
 msgstr "禁止右轉"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_straight_on"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "no_u_turn"
 msgstr "禁止廻轉"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_right_turn"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_left_turn"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4297
+#: build/trans_presets.java:4310
 msgid "only_straight_on"
 msgstr ""
@@ -32392,16 +32487,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4315
 msgid "from way"
 msgstr "from 路徑"
 
 #. item "Relations/Turn restriction" role "via node or ways"
-#: build/trans_presets.java:4303
-#, fuzzy
+#: build/trans_presets.java:4316
 msgid "via node or ways"
-msgstr "via 節點或路徑"
+msgstr ""
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4304
+#: build/trans_presets.java:4317
 msgid "to way"
 msgstr "to 路徑"
@@ -32409,5 +32503,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4307
+#: build/trans_presets.java:4320
 msgid "Route"
 msgstr "路線"
@@ -32421,5 +32515,5 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4328
 msgid "Edit Route"
 msgstr "編輯路線"
@@ -32429,5 +32523,5 @@
 #. <key key="type" value="route" />
 #. item "Relations/Directional Route (North America)" combo "Route type"
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "Route type"
 msgstr "路線類型"
@@ -32435,5 +32529,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32443,5 +32537,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "road"
 msgstr "道路"
@@ -32449,5 +32543,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ferry"
 msgstr "渡輪"
@@ -32455,5 +32549,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "ski"
 msgstr ""
@@ -32506,5 +32600,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:199 build/trans_style.java:531
 #: build/trans_style.java:537 build/trans_style.java:557
@@ -32516,5 +32610,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "hiking"
 msgstr "健行"
@@ -32522,5 +32616,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32530,5 +32624,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 msgid "detour"
 msgstr ""
@@ -32542,5 +32636,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_presets.java:4330 build/trans_presets.java:4360
 #: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
@@ -32551,5 +32645,5 @@
 #. item "Relations/Route" text "Symbol description"
 #. item "Relations/Directional Route (North America)" text "Symbol description"
-#: build/trans_presets.java:4320 build/trans_presets.java:4350
+#: build/trans_presets.java:4333 build/trans_presets.java:4363
 msgid "Symbol description"
 msgstr ""
@@ -32561,6 +32655,6 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4323 build/trans_presets.java:4353
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4336 build/trans_presets.java:4366
+#: build/trans_presets.java:4388
 msgid "Network"
 msgstr "網路"
@@ -32568,5 +32662,5 @@
 #. item "Relations/Route" combo "Route state"
 #. item "Relations/Directional Route (North America)" combo "Route state"
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "Route state"
 msgstr "路線狀態"
@@ -32574,5 +32668,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "proposed"
 msgstr ""
@@ -32580,5 +32674,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "alternate"
 msgstr "替代"
@@ -32586,5 +32680,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "temporary"
 msgstr "暫時"
@@ -32592,5 +32686,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4325 build/trans_presets.java:4355
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
 msgid "connection"
 msgstr "連線"
@@ -32598,5 +32692,5 @@
 #. item "Relations/Route" text "Color (hex)"
 #. item "Relations/Directional Route (North America)" text "Color (hex)"
-#: build/trans_presets.java:4326 build/trans_presets.java:4356
+#: build/trans_presets.java:4339 build/trans_presets.java:4369
 msgid "Color (hex)"
 msgstr "顏色(16 進制)"
@@ -32608,15 +32702,15 @@
 #. <roles>
 #. item "Relations/Directional Route (North America)" role "route segment"
-#: build/trans_presets.java:4329 build/trans_presets.java:4359
+#: build/trans_presets.java:4342 build/trans_presets.java:4372
 msgid "route segment"
 msgstr "路線區段"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4330
+#: build/trans_presets.java:4343
 msgid "forward segment"
 msgstr "前進區段"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4331
+#: build/trans_presets.java:4344
 msgid "backward segment"
 msgstr "後退區段"
@@ -32624,5 +32718,5 @@
 #. item "Relations/Route" role "halt point"
 #. item "Relations/Directional Route (North America)" role "halt point"
-#: build/trans_presets.java:4332 build/trans_presets.java:4364
+#: build/trans_presets.java:4345 build/trans_presets.java:4377
 msgid "halt point"
 msgstr ""
@@ -32630,5 +32724,5 @@
 #. item "Relations/Route" role "forward halt point"
 #. item "Relations/Directional Route (North America)" role "forward halt point"
-#: build/trans_presets.java:4333 build/trans_presets.java:4365
+#: build/trans_presets.java:4346 build/trans_presets.java:4378
 msgid "forward halt point"
 msgstr ""
@@ -32636,5 +32730,5 @@
 #. item "Relations/Route" role "backward halt point"
 #. item "Relations/Directional Route (North America)" role "backward halt point"
-#: build/trans_presets.java:4334 build/trans_presets.java:4366
+#: build/trans_presets.java:4347 build/trans_presets.java:4379
 msgid "backward halt point"
 msgstr ""
@@ -32642,5 +32736,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4337
+#: build/trans_presets.java:4350
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32654,35 +32748,31 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
-#: build/trans_presets.java:4345
+#: build/trans_presets.java:4358
 msgid "Edit Directional Route (used in North America)"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4360
-#, fuzzy
+#: build/trans_presets.java:4373
 msgid "east segment"
-msgstr "外部區段"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4361
-#, fuzzy
+#: build/trans_presets.java:4374
 msgid "north segment"
-msgstr "外部區段"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4362
-#, fuzzy
+#: build/trans_presets.java:4375
 msgid "west segment"
-msgstr "外部區段"
+msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4363
-#, fuzzy
+#: build/trans_presets.java:4376
 msgid "south segment"
-msgstr "外部區段"
+msgstr ""
 
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4369
+#: build/trans_presets.java:4382
 msgid "Route network"
 msgstr "路線網路"
@@ -32690,5 +32780,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4371
+#: build/trans_presets.java:4384
 msgid "Edit route network"
 msgstr "編輯路線網路"
@@ -32697,5 +32787,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4379
+#: build/trans_presets.java:4392
 msgid "member"
 msgstr "成員"
@@ -32703,5 +32793,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4395
 msgid "Associated street"
 msgstr "關聯的街道"
@@ -32709,10 +32799,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4384
+#: build/trans_presets.java:4397
 msgid "Edit associated street"
 msgstr "編輯關聯的街道"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4389
+#: build/trans_presets.java:4402
 msgid "house"
 msgstr ""
@@ -36189,26 +36279,23 @@
 msgstr ""
 
-#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
-#: build/trans_validator.java:70
-msgid "oneway combined with *:backward/forward"
-msgstr ""
-
+#. see #5844, #6760
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:72
+#: build/trans_validator.java:73
 msgid "layer tag with + sign"
 msgstr "有 + 號的圖層標籤"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:74
+#: build/trans_validator.java:75
 msgid "street name contains ss"
 msgstr "街道名稱包含 ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:76
+#: build/trans_validator.java:77
 msgid "relation without type"
 msgstr "沒有類型的關係"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "restaurant without name"
 msgstr "沒有名稱的餐廳"
@@ -36217,236 +36304,548 @@
 #. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:81
+#: build/trans_validator.java:82
 msgid "unusual tag combination (highway & waterway)"
 msgstr ""
 
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:82
+#: build/trans_validator.java:83
 msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
-#. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
-#. http://irs.gis-lab.info/?layers=landsat&
-#: build/trans_wms.java:2
+#. <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+#. <imagery>
+#. <!--true;Landsat;http://irs.gis-lab.info/?layers=landsat&-->
+#. <entry>
+#. <name>Landsat</name>
+#: build/trans_wms.java:5
 msgid "Landsat"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#: build/trans_wms.java:3
+#. <type>wms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. </entry>
+#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>Open Aerial Map</name>
+#: build/trans_wms.java:12
 msgid "Open Aerial Map"
 msgstr "開放航空圖"
 
-#. bing:bing
-#: build/trans_wms.java:4
+#. <type>wms</type>
+#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
+#. </entry>
+#. <!--different forms for web access-->
+#. <!--true;Bing Sat;bing:bing-->
+#. <entry>
+#. <name>Bing Sat</name>
+#: build/trans_wms.java:19
 msgid "Bing Sat"
 msgstr ""
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
-#: build/trans_wms.java:5
+#. <type>bing</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://www.bing.com/maps/</url>
+#. <default>true</default>
+#. </entry>
+#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
+#. <entry>
+#. <name>Yahoo Sat</name>
+#: build/trans_wms.java:27
 msgid "Yahoo Sat"
 msgstr "Yahoo Sat"
 
-#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png
-#: build/trans_wms.java:6
+#. <type>html</type>
+#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
+#. </entry>
+#. <!--Tile based access-->
+#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#. <entry>
+#. <name>MapQuest Open Aerial</name>
+#: build/trans_wms.java:34
 msgid "MapQuest Open Aerial"
 msgstr ""
 
-#. tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm
-#: build/trans_wms.java:7
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png]]></url>
+#. </entry>
+#. <!--true;OpenStreetMap (Mapnik);tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm-->
+#. <entry>
+#. <namUse of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. e>OpenStreetMap (Mapnik)</name>
+#: build/trans_wms.java:42
 msgid "OpenStreetMap (Mapnik)"
 msgstr ""
 
-#. tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:8
-msgid "OpenStreetMap (Mapnik B&W)"
-msgstr ""
-
-#. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
-#: build/trans_wms.java:9
+#. <type>tms</type>
+#. <default>true</default>
+#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#. <entry>
+#. <name>OpenCycleMap</name>
+#: build/trans_wms.java:62
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm
-#: build/trans_wms.java:10
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#. <entry>
+#. <name>TilesAtHome</name>
+#: build/trans_wms.java:71
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm
-#: build/trans_wms.java:11
+#. <type>tms</type>
+#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#. <entry>
+#. <name>MapQuest OSM</name>
+#: build/trans_wms.java:80
 msgid "MapQuest OSM"
 msgstr ""
 
-#. tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm
-#: build/trans_wms.java:12
+#. <type>tms</type>
+#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
+#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#. <entry>
+#. <name>ODBL coverage</name>
+#: build/trans_wms.java:90
 msgid "ODBL coverage"
 msgstr ""
 
-#. tms[18]:http://tile.xn--pnvkarte-m4a.de/tilegen;;;osm;osm;osm
-#: build/trans_wms.java:13
-msgid "PNV"
-msgstr ""
-
-#. tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm
-#: build/trans_wms.java:14
+#. <type>tms</type>
+#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#. <!--only for Europe-->
+#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#. <entry>
+#. <name>ÖPNV</name>
+#: build/trans_wms.java:101
+msgid "ÖPNV"
+msgstr ""
+
+#. <type>tms</type>
+#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--false;German Style;tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
+#. <entry>
+#. <name>German Style</name>
+#: build/trans_wms.java:111
 msgid "German Style"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#: build/trans_wms.java:15
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>EU</country-code>
+#. </entry>
+#. <!--only for Germany-->
+#. <!--false;Streets NRW Geofabrik.de;http:/Use of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
+#. /tools.geofabrik.de/osmi/view/strassennrw/josmwms?-->
+#. <entry>
+#. <name>Streets NRW Geofabrik.de</name>
+#: build/trans_wms.java:123
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm
-#: build/trans_wms.java:16
-msgid "Hike & Bike"
-msgstr ""
-
-#. tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm
-#: build/trans_wms.java:17
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Sorbische Karte;tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm-->
+#. <entry>
+#. <name>Sorbische Karte</name>
+#: build/trans_wms.java:140
 msgid "Sorbische Karte"
 msgstr ""
 
-#. tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm
-#: build/trans_wms.java:18
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Deutsche Karte;tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm-->
+#. <entry>
+#. <name>Deutsche Karte</name>
+#: build/trans_wms.java:150
 msgid "Deutsche Karte"
 msgstr ""
 
-#. tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm
-#: build/trans_wms.java:19
+#. <type>tms</type>
+#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png]]></url>
+#. <max-zoom>17</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;OpenPT Map;tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm-->
+#. <entry>
+#. <name>OpenPT Map</name>
+#: build/trans_wms.java:160
 msgid "OpenPT Map"
 msgstr ""
 
-#. wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&
-#: build/trans_wms.java:20
+#. <type>tms</type>
+#. <url><![CDATA[http://openptmap.de/tiles/{zoom}/{x}/{y}.png]]></url>
+#. <min-zoom>5</min-zoom>
+#. <max-zoom>16</max-zoom>
+#. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--false;Bayern (2m);wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&-->
+#. <entry>
+#. <name>Bayern (2m)</name>
+#: build/trans_wms.java:172
 msgid "Bayern (2m)"
 msgstr ""
 
-#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
-#: build/trans_wms.java:21
+#. <type>wms</type>
+#. <url><![CDATA[http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&]]></url>
+#. <country-code>DE</country-code>
+#. </entry>
+#. <!--only for Austria-->
+#. <!--false;Geoimage.at;http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&-->
+#. <entry>
+#. <name>Geoimage.at</name>
+#: build/trans_wms.java:180
 msgid "Geoimage.at"
 msgstr ""
 
-#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
-#: build/trans_wms.java:22
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&]]></url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--false;Geoimage.at (HighRes);wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste-->
+#. <entry>
+#. <name>Geoimage.at (HighRes)</name>
+#: build/trans_wms.java:187
 msgid "Geoimage.at (HighRes)"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#. <type>wms</type>
+#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&]]></url>
+#. <bounds min-lat='9.35676' min-lon='46.0872' max-lat='17.3099' max-lon='49.2092'/>
+#. <attribution-text mandatory='true'>geoimage.at</attribution-text>
+#. <terms-of-use-url>http://www.geoimage.at/geoimage/geodatendienste</terms-of-use-url>
+#. <country-code>AT</country-code>
+#. </entry>
+#. <!--only for North America-->
+#. <!--Terraserver USCG - High resolution maps-->
+#. <!--false;MSR Maps Topo;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Topo</name>
+#: build/trans_wms.java:199
 msgid "MSR Maps Topo"
 msgstr ""
 
-#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:24
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--false;MSR Maps Urban;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&-->
+#. <entry>
+#. <name>MSR Maps Urban</name>
+#: build/trans_wms.java:206
 msgid "MSR Maps Urban"
 msgstr ""
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:25
+#. <type>wms</type>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&]]></url>
+#. <country-code>US</country-code>
+#. </entry>
+#. <!--only for Czech Republic-->
+#. <!--false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&-->
+#. <entry>
+#. <name>Czech CUZK:KM</name>
+#: build/trans_wms.java:214
 msgid "Czech CUZK:KM"
 msgstr "捷克 CUZK:KM"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:26
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Czech UHUL:ORTOFOTO</name>
+#: build/trans_wms.java:221
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "捷克 UHUL:ORTOFOTO"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:27
+#. <type>wms</type>
+#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&]]></url>
+#. <country-code>CZ</country-code>
+#. </entry>
+#. <!--only for GB-->
+#. <!--false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&-->
+#. <entry>
+#. <name>NPE Maps</name>
+#: build/trans_wms.java:229
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://timsc.dev.openstreetmap.org/wms2/map.php?
-#: build/trans_wms.java:28
+#. <type>wms</type>
+#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
+#. <entry>
+#. <name>NPE Maps (Tim)</name>
+#: build/trans_wms.java:236
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:29
+#. <type>wms</type>
+#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
+#. <entry>
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:243
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#. <type>wms</type>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
+#. <country-code>GB</country-code>
+#. </entry>
+#. <!--only for Japan-->
+#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO)</name>
+#: build/trans_wms.java:251
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT 日本 (ORTHO)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO01)</name>
+#: build/trans_wms.java:258
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT 日本 (ORTHO01)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO02)</name>
+#: build/trans_wms.java:265
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT 日本 (ORTHO02)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:33
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
+#. <entry>
+#. <name>MLIT Japan (ORTHO03)</name>
+#: build/trans_wms.java:272
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT 日本 (ORTHO03)"
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:34
+#. <type>wms</type>
+#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
+#. <country-code>JA</country-code>
+#. </entry>
+#. <!--only for Italy-->
+#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#. <entry>
+#. <name>Lodi - Italy</name>
+#: build/trans_wms.java:280
 msgid "Lodi - Italy"
 msgstr ""
 
-#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:35
+#. <type>wms</type>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Sicily - Italy</name>
+#: build/trans_wms.java:287
 msgid "Sicily - Italy"
 msgstr ""
 
-#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:36
+#. <type>wms</type>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#. <entry>
+#. <name>PCN 2006 - Italy</name>
+#: build/trans_wms.java:294
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - 義大利"
 
-#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:37
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <country-code>IT</country-code>
+#. </entry>
+#. <!--only for France-->
+#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#. <entry>
+#. <name>SPOTMaps (France)</name>
+#: build/trans_wms.java:302
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps（法國）"
 
-#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:38
+#. <type>wms</type>
+#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
+#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <!--only for Spain-->
+#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#. <entry>
+#. <name>PNOA Spain</name>
+#: build/trans_wms.java:311
 msgid "PNOA Spain"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:39
+#. <type>wms</type>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <country-code>ES</country-code>
+#. </entry>
+#. <!--only for Estonia-->
+#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#. <entry>
+#. <name>Estonia Basemap (Maaamet)</name>
+#: build/trans_wms.java:320
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:40
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#. <entry>
+#. <name>Estonia Ortho (Maaamet)</name>
+#: build/trans_wms.java:327
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
-#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:41
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#. <entry>
+#. <name>Estonia Multi (Maaamet)</name>
+#: build/trans_wms.java:334
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
-#. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:42
+#. <type>wms</type>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <country-code>EE</country-code>
+#. </entry>
+#. <!--only for Denmark-->
+#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#. <entry>
+#. <name>Fugro (Denmark)</name>
+#: build/trans_wms.java:342
 msgid "Fugro (Denmark)"
 msgstr ""
 
-#. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:43
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
+#. <max-zoom>19</max-zoom>
+#. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
+#. <terms-of-use-url>http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2</terms-of-use-url>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--false;Stevns (Denmark);tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune-->
+#. <entry>
+#. <name>Stevns (Denmark)</name>
+#: build/trans_wms.java:354
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
-#: build/trans_wms.java:44
+#. <type>tms</type>
+#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png]]></url>
+#. <bounds min-lat='55.23403' min-lon='12.09144' max-lat='55.43647' max-lon='12.47712'/>
+#. <max-zoom>20</max-zoom>
+#. <attribution-text mandatory='true'>Stevns Kommune</attribution-text>
+#. <country-code>DK</country-code>
+#. </entry>
+#. <!--only for Phillipines-->
+#. <!--false;Pangasinan (Phillipines HiRes);tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines-->
+#. <entry>
+#. <name>Pangasinan (Phillipines HiRes)</name>
+#: build/trans_wms.java:365
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
-#. scanex:irs;;;IRS
-#: build/trans_wms.java:45
+#. <type>tms</type>
+#. <url><![CDATA[http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png]]></url>
+#. <country-code>PH</country-code>
+#. </entry>
+#. <!--only for Russia-->
+#. <!--false;ScanEx IRS;scanex:irs;;;IRS-->
+#. <entry>
+#. <name>ScanEx IRS</name>
+#: build/trans_wms.java:373
 msgid "ScanEx IRS"
 msgstr ""
 
-#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
-#: build/trans_wms.java:46
+#. <type>scanex</type>
+#. <!-- url is used as identifier, so put something here -->
+#. <url>http://irs.gis-lab.info/</url>
+#. <attribution-text mandatory='true'>IRS</attribution-text>
+#. <country-code>RU</country-code>
+#. </entry>
+#. <!--only for South Africa-->
+#. <!--false;South Africa Topo (OOC);tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1-->
+#. <entry>
+#. <name>South Africa Topo (OOC)</name>
+#: build/trans_wms.java:383
 msgid "South Africa Topo (OOC)"
 msgstr ""
@@ -40193,12 +40592,10 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
-#, fuzzy
 msgid "Merge overlap"
-msgstr "合併圖層"
+msgstr ""
 
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
-#, fuzzy
 msgid "Merge overlap of ways."
-msgstr "重疊的路徑。"
+msgstr ""
 
 #. Commit
@@ -43580,4 +43977,28 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#, fuzzy
+msgid "Open custom URL"
+msgstr "開啟 URL"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+msgid "Opens specified URL browser"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:141
+msgid ""
+"You can open custom URL for <b>one</b> selected object<br/> <b>&#123;"
+"key&#125;</b> is replaced with the tag walue<br/> <b>&#123;#id&#125;</b> is "
+"replaced with the element ID<br/> <b>&#123;#type&#125;</b> is replaced with "
+"\"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;"
+"</b> is replaced with element latitude/longitude"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:151
+#, fuzzy
+msgid "Configure custom URL"
+msgstr "設定網站..."
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
@@ -43634,5 +44055,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
 msgid "More tools"
 msgstr "更多工具"
@@ -44120,22 +44541,2 @@
 msgid "Drive a race car on this layer"
 msgstr ""
-
-#~ msgid ""
-#~ "<b>tags:</b>... - object with given number of tags (tags:count or tags:"
-#~ "min-max)"
-#~ msgstr "<b>tags:</b>... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" way."
-#~ msgstr "「from」路徑沒有開始或結束於「via」路徑"
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" way."
-#~ msgstr "「to」路徑沒有開始或結束於「via」路徑"
-
-#~ msgid "Reversed water: land not on left side"
-#~ msgstr "反轉的水域：陸地不在左側"
-
-#~ msgid "Incline Steep"
-#~ msgstr "險升/降坡"
-
-#~ msgid "fossil"
-#~ msgstr "燃油"
