Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 14844)
+++ applications/editors/josm/i18n/po/ja.po	(revision 14951)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 15:23+0200\n"
-"PO-Revision-Date: 2009-04-21 12:23+0000\n"
-"Last-Translator: nazotoko <shunw@ics.uci.edu>\n"
+"POT-Creation-Date: 2009-05-07 19:35+0200\n"
+"PO-Revision-Date: 2009-05-03 14:43+0000\n"
+"Last-Translator: Hiroshi Miura <miurahr@acm.org>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
+"X-Launchpad-Export-Date: 2009-05-07 16:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -63,5 +63,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
@@ -83,5 +83,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
@@ -117,5 +117,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
 msgid "UNKNOWN"
-msgstr "UNKNOWN"
+msgstr "不明"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
@@ -176,5 +176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 msgid "Readme"
-msgstr "Readme"
+msgstr "はじめにお読みください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
@@ -476,5 +476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
@@ -530,5 +530,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69
 #, java-format
 msgid "File: {0}"
@@ -625,19 +625,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
 msgid "Copyright year"
-msgstr "Copyright year"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgstr "Copyright 年"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 msgid "Keywords"
 msgstr "キーワード"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122
 msgid "Export options"
 msgstr "エキスポートのオプション"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
 msgid "Export and Save"
 msgstr "エキスポートして保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
 #, java-format
 msgid ""
@@ -648,5 +648,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
@@ -664,5 +664,5 @@
 msgstr "エラー"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221
 msgid "Choose a predefined license"
 msgstr "事前定義のライセンスを選択"
@@ -682,5 +682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
@@ -869,5 +869,5 @@
 msgstr "\"{0}\"を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:95
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
 #, java-format
@@ -875,6 +875,6 @@
 msgstr "ファイルの拡張子が不明です: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:122
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
@@ -883,30 +883,30 @@
 msgstr "{0} からのオーディオマーカー"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Coordinates imported: "
 msgstr "座標をインポートしました。 "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
 msgid "Malformed sentences: "
 msgstr "不正なセンテンス: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
 msgid "Checksum errors: "
 msgstr "チェックサムエラー "
 
 #. don't scare the user unneccessarily
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
 msgid "Unknown sentences: "
 msgstr "不明なセンテンス: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140
 msgid "Zero coordinates: "
 msgstr "ゼロ座標: "
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144
 msgid "NMEA import success"
 msgstr "NMEAインポートの成功"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148
 msgid "NMEA import faliure!"
 msgstr "NMEAインポートの失敗！"
@@ -1399,26 +1399,26 @@
 msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
@@ -1432,17 +1432,18 @@
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:375
 msgid "Uploading data"
 msgstr "アップロードするデータ"
@@ -1968,5 +1969,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
@@ -2081,5 +2082,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
 msgid_plural "nodes"
@@ -2255,5 +2256,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "relation"
 msgid_plural "relations"
@@ -2268,8 +2269,8 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:119
 msgid "highway"
-msgstr "高速道路"
+msgstr "道路"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "railway"
 msgstr "鉄道"
@@ -2419,5 +2420,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
 msgid_plural "ways"
@@ -2496,4 +2497,24 @@
 msgstr "メルカトル"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
+#, fuzzy, java-format
+msgid ""
+"The projection \"{0}\" is designed for\n"
+"latitudes between 45.7° and 47.9°\n"
+"and longitutes between 5.7° and 10.6° only.\n"
+"Use another projection system if you are not working\n"
+"on a data set of Switzerland or Liechtenstein.\n"
+"Do not upload any data after this message."
+msgstr ""
+"投影法\"{0}\"は、緯度が46.1°から57°の\n"
+"間で使われるように設計されています。\n"
+"フランスのWMSサーバをつかうのではなければ、\n"
+"ほかの投影法を使用してください。\n"
+"本メッセージ後は、データのアップロードはやめてください。"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+msgid "Swiss Grid (Switzerland)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
 msgid "Could not read bookmarks."
@@ -2509,7 +2530,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:210
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -2521,6 +2542,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -2697,4 +2718,6 @@
 "some data before --selection"
 msgstr ""
+"指定された順番で設定が読み込まれます。一部のデータがselection以前に\n"
+"読み込まれることにご注意ください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
@@ -3061,5 +3084,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96
 msgid "<different>"
 msgstr "<差異あり>"
@@ -3272,5 +3295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2958
 msgid "Relations"
 msgstr "リレーション"
@@ -3461,5 +3484,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2603
 msgid "Places"
 msgstr "地名"
@@ -3506,21 +3529,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1832 build/trans_presets.java:1838
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1925
-#: build/trans_presets.java:1932 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
 msgid "type"
 msgstr "タイプ"
@@ -3575,5 +3598,5 @@
 #. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1674
 msgid "Map"
 msgstr "マップ"
@@ -3807,10 +3830,10 @@
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:653
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid ""
@@ -3822,10 +3845,10 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
@@ -3836,29 +3859,29 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:803
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804
 #, java-format
 msgid ""
@@ -3869,9 +3892,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:873
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -3881,5 +3904,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -3894,7 +3917,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
-#, fuzzy, java-format
+#, java-format
 msgid "version {0}"
-msgstr "バージョン{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
@@ -3909,12 +3932,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
-#, fuzzy
 msgid "unset"
-msgstr "使用法"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
-#, fuzzy, java-format
+#, java-format
 msgid "API version: {0}"
-msgstr "バージョン{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
@@ -3924,21 +3946,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1832 build/trans_presets.java:1838
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1925
-#: build/trans_presets.java:1932 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
 msgid "track"
 msgid_plural "tracks"
@@ -4052,30 +4074,45 @@
 msgstr "URL を表示する際にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
 msgid "Advanced Preferences"
 msgstr "高度な設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "設定項目を直接変更。利用に注意！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "検索: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
 msgid "Current value is default."
 msgstr "現在の値は既定値です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "既定値は \"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "不明なときの既定値(設定はまだ使われません）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
-msgid "Enter a new key/value pair"
-msgstr "新しいキー/値の組を入力"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
+msgid "Please select the row to edit."
+msgstr "編集する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:190
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "新しい値は{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:199
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
@@ -4085,59 +4122,50 @@
 msgstr "削除する列を選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "編集する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:159
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "新しい値は{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:216
+msgid "Enter a new key/value pair"
+msgstr "新しいキー/値の組を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
 msgid "Display the Audio menu."
 msgstr "オーディオメニューの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
 msgid "Label audio (and image and web) markers."
 msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
 msgid "Display live audio trace."
 msgstr "ライブ音声トレースの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
 msgid "Create non-audio markers when reading GPX."
 msgstr "GPXを読み込むときにマーカー(オーディオではない)を作成"
 
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
 msgid "Explicit waypoints with valid timestamps."
 msgstr "有効なタイムスタンプによる明示的なウエイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "トラック位置から時間推定による明示的なウエイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
 msgid "Named trackpoints."
 msgstr "名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
 msgid "Modified times (time stamps) of audio files."
 msgstr "音声ファイルの修正時刻(タイムスタンプ)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "追跡開始（有効なマーカーがないときには常に行う）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -4147,5 +4175,5 @@
 "を動かして表示する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -4155,5 +4183,5 @@
 "ベルを付与する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -4163,16 +4191,16 @@
 "る。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
 msgid "When importing audio, make markers from..."
 msgstr "オーディオをインポート時、次からマーカーを作成..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 "オーディオのインポート時に、GPXレイヤーのウェイポイントに対して、適用する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -4182,5 +4210,5 @@
 "カーを作成し、名前と説明を付加する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -4190,5 +4218,5 @@
 "ラックの位置にオーディオマーカーを作成してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -4196,17 +4224,17 @@
 msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid "Forward/back time (seconds)"
 msgstr "時刻を進める/戻す(秒)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "早回しの時に何倍速にするのか。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "Fast forward multiplier"
 msgstr "高速再生の倍率"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -4216,13 +4244,13 @@
 "ら開始する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid "Lead-in time (seconds)"
 msgstr "Lead-in 時間(秒)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "音声録音の残り時間と実際の残り時間の割合"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "Voice recorder calibration"
 msgstr "ボイスレコーダの調整"
@@ -4940,148 +4968,148 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
 #: build/trans_presets.java:56 build/trans_presets.java:92
-#: build/trans_presets.java:130 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:203
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:258 build/trans_presets.java:291
-#: build/trans_presets.java:336 build/trans_presets.java:356
-#: build/trans_presets.java:371 build/trans_presets.java:388
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:447 build/trans_presets.java:465
-#: build/trans_presets.java:485 build/trans_presets.java:505
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:639
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:736 build/trans_presets.java:745
-#: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:882
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1039 build/trans_presets.java:1047
-#: build/trans_presets.java:1057 build/trans_presets.java:1065
-#: build/trans_presets.java:1070 build/trans_presets.java:1077
-#: build/trans_presets.java:1084 build/trans_presets.java:1089
-#: build/trans_presets.java:1097 build/trans_presets.java:1106
-#: build/trans_presets.java:1112 build/trans_presets.java:1118
-#: build/trans_presets.java:1123 build/trans_presets.java:1129
-#: build/trans_presets.java:1135 build/trans_presets.java:1144
-#: build/trans_presets.java:1153 build/trans_presets.java:1160
-#: build/trans_presets.java:1168 build/trans_presets.java:1181
-#: build/trans_presets.java:1187 build/trans_presets.java:1196
-#: build/trans_presets.java:1202 build/trans_presets.java:1208
-#: build/trans_presets.java:1216 build/trans_presets.java:1271
-#: build/trans_presets.java:1318 build/trans_presets.java:1324
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1353
-#: build/trans_presets.java:1361 build/trans_presets.java:1370
-#: build/trans_presets.java:1377 build/trans_presets.java:1383
-#: build/trans_presets.java:1391 build/trans_presets.java:1398
-#: build/trans_presets.java:1407 build/trans_presets.java:1415
-#: build/trans_presets.java:1422 build/trans_presets.java:1433
-#: build/trans_presets.java:1443 build/trans_presets.java:1453
-#: build/trans_presets.java:1473 build/trans_presets.java:1485
-#: build/trans_presets.java:1496 build/trans_presets.java:1512
-#: build/trans_presets.java:1519 build/trans_presets.java:1534
-#: build/trans_presets.java:1541 build/trans_presets.java:1546
-#: build/trans_presets.java:1552 build/trans_presets.java:1558
-#: build/trans_presets.java:1563 build/trans_presets.java:1569
-#: build/trans_presets.java:1575 build/trans_presets.java:1583
-#: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1603 build/trans_presets.java:1608
-#: build/trans_presets.java:1614 build/trans_presets.java:1620
-#: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1641 build/trans_presets.java:1647
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1667 build/trans_presets.java:1673
-#: build/trans_presets.java:1680 build/trans_presets.java:1688
-#: build/trans_presets.java:1694 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1717
-#: build/trans_presets.java:1722 build/trans_presets.java:1729
-#: build/trans_presets.java:1735 build/trans_presets.java:1741
-#: build/trans_presets.java:1747 build/trans_presets.java:1752
-#: build/trans_presets.java:1757 build/trans_presets.java:1764
-#: build/trans_presets.java:1770 build/trans_presets.java:1775
-#: build/trans_presets.java:1783 build/trans_presets.java:1792
-#: build/trans_presets.java:1801 build/trans_presets.java:1810
-#: build/trans_presets.java:1819 build/trans_presets.java:1824
-#: build/trans_presets.java:1831 build/trans_presets.java:1837
-#: build/trans_presets.java:1843 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1873
-#: build/trans_presets.java:1879 build/trans_presets.java:1885
-#: build/trans_presets.java:1891 build/trans_presets.java:1897
-#: build/trans_presets.java:1903 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2067
-#: build/trans_presets.java:2074 build/trans_presets.java:2082
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2127 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2155 build/trans_presets.java:2186
-#: build/trans_presets.java:2191 build/trans_presets.java:2196
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2219
-#: build/trans_presets.java:2227 build/trans_presets.java:2233
-#: build/trans_presets.java:2239 build/trans_presets.java:2245
-#: build/trans_presets.java:2251 build/trans_presets.java:2261
-#: build/trans_presets.java:2354 build/trans_presets.java:2361
-#: build/trans_presets.java:2375 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2425 build/trans_presets.java:2431
-#: build/trans_presets.java:2436 build/trans_presets.java:2441
-#: build/trans_presets.java:2446 build/trans_presets.java:2451
-#: build/trans_presets.java:2456 build/trans_presets.java:2462
-#: build/trans_presets.java:2468 build/trans_presets.java:2474
-#: build/trans_presets.java:2479 build/trans_presets.java:2484
-#: build/trans_presets.java:2489 build/trans_presets.java:2494
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2536 build/trans_presets.java:2543
-#: build/trans_presets.java:2557 build/trans_presets.java:2562
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2595 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2616
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2642
-#: build/trans_presets.java:2649 build/trans_presets.java:2655
-#: build/trans_presets.java:2661 build/trans_presets.java:2669
-#: build/trans_presets.java:2676 build/trans_presets.java:2683
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2703 build/trans_presets.java:2712
-#: build/trans_presets.java:2718 build/trans_presets.java:2724
-#: build/trans_presets.java:2730 build/trans_presets.java:2736
-#: build/trans_presets.java:2745 build/trans_presets.java:2755
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2793
-#: build/trans_presets.java:2802 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:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2856
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2876 build/trans_presets.java:2885
-#: build/trans_presets.java:2893 build/trans_presets.java:2899
-#: build/trans_presets.java:2905 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2937
-#: build/trans_presets.java:2943 build/trans_presets.java:2949
-#: build/trans_presets.java:2962 build/trans_presets.java:2976
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:132 build/trans_presets.java:169
+#: build/trans_presets.java:189 build/trans_presets.java:207
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:262 build/trans_presets.java:295
+#: build/trans_presets.java:340 build/trans_presets.java:360
+#: build/trans_presets.java:375 build/trans_presets.java:392
+#: build/trans_presets.java:412 build/trans_presets.java:432
+#: build/trans_presets.java:451 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:509
+#: build/trans_presets.java:530 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:593
+#: build/trans_presets.java:614 build/trans_presets.java:643
+#: build/trans_presets.java:664 build/trans_presets.java:677
+#: build/trans_presets.java:690 build/trans_presets.java:703
+#: build/trans_presets.java:716 build/trans_presets.java:729
+#: build/trans_presets.java:740 build/trans_presets.java:749
+#: build/trans_presets.java:796 build/trans_presets.java:817
+#: build/trans_presets.java:826 build/trans_presets.java:886
+#: build/trans_presets.java:1027 build/trans_presets.java:1035
+#: build/trans_presets.java:1043 build/trans_presets.java:1051
+#: build/trans_presets.java:1061 build/trans_presets.java:1069
+#: build/trans_presets.java:1074 build/trans_presets.java:1081
+#: build/trans_presets.java:1088 build/trans_presets.java:1093
+#: build/trans_presets.java:1101 build/trans_presets.java:1110
+#: build/trans_presets.java:1116 build/trans_presets.java:1122
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1139 build/trans_presets.java:1148
+#: build/trans_presets.java:1157 build/trans_presets.java:1164
+#: build/trans_presets.java:1172 build/trans_presets.java:1185
+#: build/trans_presets.java:1191 build/trans_presets.java:1200
+#: build/trans_presets.java:1206 build/trans_presets.java:1212
+#: build/trans_presets.java:1220 build/trans_presets.java:1275
+#: build/trans_presets.java:1322 build/trans_presets.java:1328
+#: build/trans_presets.java:1334 build/trans_presets.java:1340
+#: build/trans_presets.java:1346 build/trans_presets.java:1357
+#: build/trans_presets.java:1365 build/trans_presets.java:1374
+#: build/trans_presets.java:1381 build/trans_presets.java:1387
+#: build/trans_presets.java:1395 build/trans_presets.java:1402
+#: build/trans_presets.java:1411 build/trans_presets.java:1419
+#: build/trans_presets.java:1426 build/trans_presets.java:1437
+#: build/trans_presets.java:1447 build/trans_presets.java:1457
+#: build/trans_presets.java:1477 build/trans_presets.java:1489
+#: build/trans_presets.java:1500 build/trans_presets.java:1516
+#: build/trans_presets.java:1523 build/trans_presets.java:1538
+#: build/trans_presets.java:1545 build/trans_presets.java:1550
+#: build/trans_presets.java:1556 build/trans_presets.java:1562
+#: build/trans_presets.java:1567 build/trans_presets.java:1573
+#: build/trans_presets.java:1579 build/trans_presets.java:1587
+#: build/trans_presets.java:1594 build/trans_presets.java:1601
+#: build/trans_presets.java:1607 build/trans_presets.java:1612
+#: build/trans_presets.java:1618 build/trans_presets.java:1624
+#: build/trans_presets.java:1631 build/trans_presets.java:1638
+#: build/trans_presets.java:1645 build/trans_presets.java:1651
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1671 build/trans_presets.java:1677
+#: build/trans_presets.java:1684 build/trans_presets.java:1692
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1711 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1733
+#: build/trans_presets.java:1739 build/trans_presets.java:1745
+#: build/trans_presets.java:1751 build/trans_presets.java:1756
+#: build/trans_presets.java:1761 build/trans_presets.java:1768
+#: build/trans_presets.java:1774 build/trans_presets.java:1779
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1823 build/trans_presets.java:1828
+#: build/trans_presets.java:1835 build/trans_presets.java:1841
+#: build/trans_presets.java:1847 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1865
+#: build/trans_presets.java:1871 build/trans_presets.java:1877
+#: build/trans_presets.java:1883 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2071
+#: build/trans_presets.java:2078 build/trans_presets.java:2086
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2131 build/trans_presets.java:2138
+#: build/trans_presets.java:2144 build/trans_presets.java:2151
+#: build/trans_presets.java:2159 build/trans_presets.java:2190
+#: build/trans_presets.java:2195 build/trans_presets.java:2200
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2231 build/trans_presets.java:2237
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2265
+#: build/trans_presets.java:2358 build/trans_presets.java:2365
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2412
+#: build/trans_presets.java:2418 build/trans_presets.java:2424
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2440 build/trans_presets.java:2445
+#: build/trans_presets.java:2450 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2483 build/trans_presets.java:2488
+#: build/trans_presets.java:2493 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2521
+#: build/trans_presets.java:2526 build/trans_presets.java:2531
+#: build/trans_presets.java:2540 build/trans_presets.java:2547
+#: build/trans_presets.java:2561 build/trans_presets.java:2566
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2599 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2626 build/trans_presets.java:2632
+#: build/trans_presets.java:2639 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2673
+#: build/trans_presets.java:2680 build/trans_presets.java:2687
+#: build/trans_presets.java:2693 build/trans_presets.java:2700
+#: build/trans_presets.java:2707 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2728
+#: build/trans_presets.java:2734 build/trans_presets.java:2740
+#: build/trans_presets.java:2749 build/trans_presets.java:2759
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2785
+#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: 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:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2860
+#: build/trans_presets.java:2867 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2966 build/trans_presets.java:2980
+#: build/trans_presets.java:2994
 msgid "Name"
 msgstr "名前"
@@ -5137,21 +5165,21 @@
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い, 可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -5159,6 +5187,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1346
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: build/trans_presets.java:1350
 msgid "Car"
 msgstr "自動車"
@@ -5178,13 +5206,13 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:838 build/trans_presets.java:857
-#: build/trans_presets.java:871 build/trans_presets.java:893
-#: build/trans_presets.java:930 build/trans_presets.java:943
-#: build/trans_presets.java:955 build/trans_presets.java:967
-#: build/trans_presets.java:979 build/trans_presets.java:991
-#: build/trans_presets.java:1001 build/trans_presets.java:1010
-#: build/trans_presets.java:1402 build/trans_presets.java:1475
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: build/trans_presets.java:313 build/trans_presets.java:639
+#: build/trans_presets.java:842 build/trans_presets.java:861
+#: build/trans_presets.java:875 build/trans_presets.java:897
+#: build/trans_presets.java:934 build/trans_presets.java:947
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1005 build/trans_presets.java:1014
+#: build/trans_presets.java:1406 build/trans_presets.java:1479
 msgid "Bicycle"
 msgstr "自転車"
@@ -5214,86 +5242,98 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:837 build/trans_presets.java:856
-#: build/trans_presets.java:870 build/trans_presets.java:892
-#: build/trans_presets.java:929 build/trans_presets.java:942
-#: build/trans_presets.java:954 build/trans_presets.java:966
-#: build/trans_presets.java:978 build/trans_presets.java:990
-#: build/trans_presets.java:1000 build/trans_presets.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: build/trans_presets.java:314 build/trans_presets.java:641
+#: build/trans_presets.java:841 build/trans_presets.java:860
+#: build/trans_presets.java:874 build/trans_presets.java:896
+#: build/trans_presets.java:933 build/trans_presets.java:946
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1004 build/trans_presets.java:1013
 msgid "Foot"
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
 msgid "Draw Direction Arrows"
 msgstr "進行方向を矢印表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "必要なときだけ方向ヒントを表示(例：一方通行の時）"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Draw inactive layers in other color"
 msgstr "不活性のレイヤーを他色で描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチアライアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
 msgid "Draw lines between raw GPS points"
 msgstr "GPS生データのポイント間にラインを引いて下さい"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#, fuzzy
+msgid ""
+"Maximum length (in meters) to draw lines for local files. Set to '-1' to "
+"draw all lines."
+msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#, fuzzy
+msgid "Maximum length for local files (meters)"
+msgstr "最大長（ｍ）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -5301,13 +5341,13 @@
 msgstr "少なくともこの距離を超える移動がなかった場合には、矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -5317,9 +5357,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -5329,46 +5369,46 @@
 "う。使用しているGPS機器がこの情報を記録している必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:215
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
 msgid "Draw the inactive data layers in a different color."
 msgstr "異なった色で、不活性になっているデータレイヤーを描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -5628,22 +5668,22 @@
 msgstr "事前設定の情報源をタグ付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:130
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
 msgid "Separator"
 msgstr "区切り"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:300
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
 msgid "Toolbar"
 msgstr "ツールバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:304
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:343
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
 msgid "Toolbar customization"
 msgstr "ツールバーのカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
 msgid "Customize the elements on the toolbar."
 msgstr "ツールバーの要素をカスタマイズ"
@@ -5785,33 +5825,33 @@
 msgstr "修飾グループ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
 msgid "More information about this feature"
 msgstr "この機能の詳細情報"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:399
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:400
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:443
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:444
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:444
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "プリセット \"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:558
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
@@ -5822,15 +5862,15 @@
 msgstr "タグの事前設定ソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
 #, java-format
@@ -5839,18 +5879,18 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614
 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:682
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -5888,13 +5928,13 @@
 msgstr "データを準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:144
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:145
 #, java-format
 msgid ""
@@ -5903,40 +5943,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149
 #, java-format
 msgid "Communications with {0} established using protocol version {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:187
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:202
+#, fuzzy
+msgid "Cannot read numeric value from response"
+msgstr "地名検索結果をサーバから読み取ることができませんでした"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:270
 msgid "Opening changeset..."
 msgstr "変更セットを開いています…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:284
 msgid "Closing changeset..."
 msgstr "変更した設定を閉じています..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:300
 msgid "No changeset present for diff upload"
-msgstr "アップロードする変更はありません。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
-#, fuzzy
-msgid "Error processing changeset upload response"
-msgstr "サーバからの応答内容が不正です。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#. shouldn't happen, but just in case
+#.
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:400
+msgid "Data upload failed for unknown reason"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444
 msgid "Not initialized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:528
 msgid "Unknown host"
 msgstr "不明なホスト"
@@ -5980,7 +6026,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown version: {0}"
-msgstr "バージョン番号は不明です"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
@@ -6039,5 +6085,5 @@
 "試してください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:110
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
@@ -6195,21 +6241,21 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1302
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368
 msgid "unknown"
 msgstr "不明な"
@@ -6436,5 +6482,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2997
 msgid "Description"
 msgstr "説明"
@@ -8156,24 +8202,24 @@
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:112
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:113
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:212
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:209
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -8183,6 +8229,6 @@
 #. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
@@ -8194,17 +8240,14 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
-#, fuzzy
 msgid "Click to add destination."
-msgstr "クリックしてルートノードの追加"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
-#, fuzzy
 msgid "Click and drag to move destination"
-msgstr "クリックとドラッグでルートノードの移動"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
-#, fuzzy
 msgid "Click to remove destination"
-msgstr "クリックしてルートノードの追加"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
@@ -8213,7 +8256,6 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
-#, fuzzy
 msgid "Add routing layer"
-msgstr "新規レイヤーを作成"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
@@ -8452,9 +8494,4 @@
 msgstr "アイテム"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "検索: "
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
@@ -8547,5 +8584,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2172
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -8989,5 +9026,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr "高速道路の重なり(エリアも含む)"
+msgstr "道路の重なり(エリアも含む)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
@@ -9931,7 +9968,7 @@
 #. item "Relations/Route" text "Name"
 #: build/trans_presets.java:54 build/trans_presets.java:90
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1521 build/trans_presets.java:2991
+#: build/trans_presets.java:110 build/trans_presets.java:130
+#: build/trans_presets.java:167 build/trans_presets.java:187
+#: build/trans_presets.java:1525 build/trans_presets.java:2995
 msgid "Reference"
 msgstr "道路番号"
@@ -9973,20 +10010,20 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: build/trans_presets.java:57 build/trans_presets.java:74
-#: build/trans_presets.java:93 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:146
-#: build/trans_presets.java:166 build/trans_presets.java:186
-#: build/trans_presets.java:209 build/trans_presets.java:227
-#: build/trans_presets.java:245 build/trans_presets.java:264
-#: build/trans_presets.java:297 build/trans_presets.java:342
-#: build/trans_presets.java:357 build/trans_presets.java:372
-#: build/trans_presets.java:394 build/trans_presets.java:414
-#: build/trans_presets.java:434 build/trans_presets.java:453
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:553 build/trans_presets.java:574
-#: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1032
-#: build/trans_presets.java:1040 build/trans_presets.java:1048
-#: build/trans_presets.java:1058 build/trans_presets.java:1277
+#: build/trans_presets.java:93 build/trans_presets.java:112
+#: build/trans_presets.java:133 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:190
+#: build/trans_presets.java:213 build/trans_presets.java:231
+#: build/trans_presets.java:249 build/trans_presets.java:268
+#: build/trans_presets.java:301 build/trans_presets.java:346
+#: build/trans_presets.java:361 build/trans_presets.java:376
+#: build/trans_presets.java:398 build/trans_presets.java:418
+#: build/trans_presets.java:438 build/trans_presets.java:457
+#: build/trans_presets.java:476 build/trans_presets.java:495
+#: build/trans_presets.java:515 build/trans_presets.java:536
+#: build/trans_presets.java:557 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:620
+#: build/trans_presets.java:649 build/trans_presets.java:1036
+#: build/trans_presets.java:1044 build/trans_presets.java:1052
+#: build/trans_presets.java:1062 build/trans_presets.java:1281
 msgid "Layer"
 msgstr "レイヤー"
@@ -10001,7 +10038,7 @@
 #. item "Streets/Roundabout" combo "Layer"
 #: build/trans_presets.java:58 build/trans_presets.java:75
-#: build/trans_presets.java:94 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:147
-#: build/trans_presets.java:167 build/trans_presets.java:343
+#: build/trans_presets.java:94 build/trans_presets.java:113
+#: build/trans_presets.java:134 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:347
 msgid "Lanes"
 msgstr "車線数"
@@ -10020,14 +10057,14 @@
 #. item "Streets/Tunnel" combo "Layer"
 #: build/trans_presets.java:59 build/trans_presets.java:76
-#: build/trans_presets.java:95 build/trans_presets.java:113
-#: build/trans_presets.java:133 build/trans_presets.java:148
-#: build/trans_presets.java:168 build/trans_presets.java:187
-#: build/trans_presets.java:210 build/trans_presets.java:266
-#: build/trans_presets.java:298 build/trans_presets.java:319
-#: build/trans_presets.java:358 build/trans_presets.java:373
-#: build/trans_presets.java:397 build/trans_presets.java:416
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:95 build/trans_presets.java:114
+#: build/trans_presets.java:135 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:191
+#: build/trans_presets.java:214 build/trans_presets.java:270
+#: build/trans_presets.java:302 build/trans_presets.java:323
+#: build/trans_presets.java:362 build/trans_presets.java:377
+#: build/trans_presets.java:401 build/trans_presets.java:420
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:497 build/trans_presets.java:651
+#: build/trans_presets.java:1283
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -10065,15 +10102,15 @@
 #. item "Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:60 build/trans_presets.java:77
-#: build/trans_presets.java:96 build/trans_presets.java:114
-#: build/trans_presets.java:134 build/trans_presets.java:149
-#: build/trans_presets.java:169 build/trans_presets.java:188
-#: build/trans_presets.java:204 build/trans_presets.java:222
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:279 build/trans_presets.java:292
-#: build/trans_presets.java:305 build/trans_presets.java:337
-#: build/trans_presets.java:389 build/trans_presets.java:409
-#: build/trans_presets.java:429 build/trans_presets.java:448
-#: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1272
+#: build/trans_presets.java:96 build/trans_presets.java:115
+#: build/trans_presets.java:136 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:192
+#: build/trans_presets.java:208 build/trans_presets.java:226
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:283 build/trans_presets.java:296
+#: build/trans_presets.java:309 build/trans_presets.java:341
+#: build/trans_presets.java:393 build/trans_presets.java:413
+#: build/trans_presets.java:433 build/trans_presets.java:452
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Oneway"
 msgstr "一方通行"
@@ -10081,8 +10118,8 @@
 #. item "Streets/Motorway" check "Oneway"
 #. item "Streets/Motorway Link" check "Oneway"
-#. item "Streets/Trunk" check "Oneway"
-#. item "Streets/Trunk Link" check "Oneway"
-#. item "Streets/Primary" check "Oneway"
-#. item "Streets/Primary Link" check "Oneway"
+#. item "Streets/Trunk" check "Motorroad"
+#. item "Streets/Trunk Link" check "Motorroad"
+#. item "Streets/Primary" check "Motorroad"
+#. item "Streets/Primary Link" check "Motorroad"
 #. item "Streets/Secondary" check "Oneway"
 #. item "Streets/Tertiary" check "Oneway"
@@ -10116,18 +10153,18 @@
 #. </button>
 #: build/trans_presets.java:61 build/trans_presets.java:78
-#: build/trans_presets.java:97 build/trans_presets.java:115
-#: build/trans_presets.java:135 build/trans_presets.java:150
-#: build/trans_presets.java:170 build/trans_presets.java:189
-#: build/trans_presets.java:205 build/trans_presets.java:223
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:293 build/trans_presets.java:338
-#: build/trans_presets.java:347 build/trans_presets.java:390
-#: build/trans_presets.java:410 build/trans_presets.java:430
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1273 build/trans_surveyor.java:12
+#: build/trans_presets.java:98 build/trans_presets.java:117
+#: build/trans_presets.java:138 build/trans_presets.java:154
+#: build/trans_presets.java:174 build/trans_presets.java:193
+#: build/trans_presets.java:209 build/trans_presets.java:227
+#: build/trans_presets.java:245 build/trans_presets.java:264
+#: build/trans_presets.java:297 build/trans_presets.java:342
+#: build/trans_presets.java:351 build/trans_presets.java:394
+#: build/trans_presets.java:414 build/trans_presets.java:434
+#: build/trans_presets.java:453 build/trans_presets.java:472
+#: build/trans_presets.java:491 build/trans_presets.java:510
+#: build/trans_presets.java:531 build/trans_presets.java:552
+#: build/trans_presets.java:573 build/trans_presets.java:594
+#: build/trans_presets.java:615 build/trans_presets.java:645
+#: build/trans_presets.java:1277 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -10164,18 +10201,18 @@
 #. item "Railway/Bus Guideway" check "Bridge"
 #: build/trans_presets.java:62 build/trans_presets.java:79
-#: build/trans_presets.java:98 build/trans_presets.java:116
-#: build/trans_presets.java:136 build/trans_presets.java:151
-#: build/trans_presets.java:171 build/trans_presets.java:190
-#: build/trans_presets.java:206 build/trans_presets.java:224
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:294 build/trans_presets.java:339
-#: build/trans_presets.java:363 build/trans_presets.java:391
-#: build/trans_presets.java:411 build/trans_presets.java:431
-#: build/trans_presets.java:450 build/trans_presets.java:469
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:99 build/trans_presets.java:118
+#: build/trans_presets.java:139 build/trans_presets.java:155
+#: build/trans_presets.java:175 build/trans_presets.java:194
+#: build/trans_presets.java:210 build/trans_presets.java:228
+#: build/trans_presets.java:246 build/trans_presets.java:265
+#: build/trans_presets.java:298 build/trans_presets.java:343
+#: build/trans_presets.java:367 build/trans_presets.java:395
+#: build/trans_presets.java:415 build/trans_presets.java:435
+#: build/trans_presets.java:454 build/trans_presets.java:473
+#: build/trans_presets.java:492 build/trans_presets.java:511
+#: build/trans_presets.java:532 build/trans_presets.java:553
+#: build/trans_presets.java:574 build/trans_presets.java:595
+#: build/trans_presets.java:616 build/trans_presets.java:646
+#: build/trans_presets.java:1278
 msgid "Tunnel"
 msgstr "トンネル"
@@ -10210,17 +10247,17 @@
 #. item "Railway/Bus Guideway" check "Tunnel"
 #: build/trans_presets.java:63 build/trans_presets.java:80
-#: build/trans_presets.java:99 build/trans_presets.java:117
-#: build/trans_presets.java:137 build/trans_presets.java:152
-#: build/trans_presets.java:172 build/trans_presets.java:191
-#: build/trans_presets.java:207 build/trans_presets.java:225
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:295 build/trans_presets.java:340
-#: build/trans_presets.java:392 build/trans_presets.java:412
-#: build/trans_presets.java:432 build/trans_presets.java:451
-#: build/trans_presets.java:470 build/trans_presets.java:489
-#: build/trans_presets.java:508 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1275
+#: build/trans_presets.java:100 build/trans_presets.java:119
+#: build/trans_presets.java:140 build/trans_presets.java:156
+#: build/trans_presets.java:176 build/trans_presets.java:195
+#: build/trans_presets.java:211 build/trans_presets.java:229
+#: build/trans_presets.java:247 build/trans_presets.java:266
+#: build/trans_presets.java:299 build/trans_presets.java:344
+#: build/trans_presets.java:396 build/trans_presets.java:416
+#: build/trans_presets.java:436 build/trans_presets.java:455
+#: build/trans_presets.java:474 build/trans_presets.java:493
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:554 build/trans_presets.java:575
+#: build/trans_presets.java:596 build/trans_presets.java:617
+#: build/trans_presets.java:647 build/trans_presets.java:1279
 msgid "Cutting"
 msgstr "切り通し"
@@ -10255,17 +10292,17 @@
 #. item "Railway/Bus Guideway" check "Cutting"
 #: build/trans_presets.java:64 build/trans_presets.java:81
-#: build/trans_presets.java:100 build/trans_presets.java:118
-#: build/trans_presets.java:138 build/trans_presets.java:153
-#: build/trans_presets.java:173 build/trans_presets.java:192
-#: build/trans_presets.java:208 build/trans_presets.java:226
-#: build/trans_presets.java:244 build/trans_presets.java:263
-#: build/trans_presets.java:296 build/trans_presets.java:341
-#: build/trans_presets.java:393 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:452
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1276
+#: build/trans_presets.java:101 build/trans_presets.java:120
+#: build/trans_presets.java:141 build/trans_presets.java:157
+#: build/trans_presets.java:177 build/trans_presets.java:196
+#: build/trans_presets.java:212 build/trans_presets.java:230
+#: build/trans_presets.java:248 build/trans_presets.java:267
+#: build/trans_presets.java:300 build/trans_presets.java:345
+#: build/trans_presets.java:397 build/trans_presets.java:417
+#: build/trans_presets.java:437 build/trans_presets.java:456
+#: build/trans_presets.java:475 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:555 build/trans_presets.java:576
+#: build/trans_presets.java:597 build/trans_presets.java:618
+#: build/trans_presets.java:648 build/trans_presets.java:1280
 msgid "Embankment"
 msgstr "土手"
@@ -10297,7 +10334,17 @@
 msgstr "国道の編集"
 
+#. item "Streets/Trunk" check "Oneway"
+#. item "Streets/Trunk Link" check "Oneway"
+#. item "Streets/Primary" check "Oneway"
+#. item "Streets/Primary Link" check "Oneway"
+#: build/trans_presets.java:97 build/trans_presets.java:116
+#: build/trans_presets.java:137 build/trans_presets.java:153
+#, fuzzy
+msgid "Motorroad"
+msgstr "モーターボート"
+
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:103
+#: build/trans_presets.java:104
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -10306,5 +10353,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:106
+#: build/trans_presets.java:107
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -10317,5 +10364,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:122 build/trans_surveyor.java:76
+#: build/trans_presets.java:124 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "都道府県道"
@@ -10324,5 +10371,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:125
+#: build/trans_presets.java:127
 msgid "Edit Primary Road"
 msgstr "都道府県道を編集"
@@ -10330,10 +10377,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:141
+#: build/trans_presets.java:144
 msgid "Primary Link"
 msgstr "都道府県道の連絡路"
 
 #. item
-#: build/trans_presets.java:142
+#: build/trans_presets.java:145
 msgid "Edit Primary Link"
 msgstr "都道府県道の連絡路の編集"
@@ -10345,5 +10392,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:156 build/trans_surveyor.java:80
+#: build/trans_presets.java:160 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "主要道路"
@@ -10353,5 +10400,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:160
+#: build/trans_presets.java:164
 msgid "Edit Secondary Road"
 msgstr "主要道路の編集"
@@ -10359,5 +10406,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:176
+#: build/trans_presets.java:180
 msgid "Tertiary"
 msgstr "主要道路(Tertiary)"
@@ -10367,5 +10414,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:180
+#: build/trans_presets.java:184
 msgid "Edit Tertiary Road"
 msgstr "主要道路(Tertiary)の編集"
@@ -10377,5 +10424,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:195 build/trans_surveyor.java:84
+#: build/trans_presets.java:199 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "１車線道"
@@ -10385,5 +10432,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:199
+#: build/trans_presets.java:203
 msgid "Edit Unclassified Road"
 msgstr "分類なし道路の編集"
@@ -10410,19 +10457,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:247 build/trans_presets.java:267
-#: build/trans_presets.java:299 build/trans_presets.java:344
-#: build/trans_presets.java:360 build/trans_presets.java:374
-#: build/trans_presets.java:398 build/trans_presets.java:417
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:474 build/trans_presets.java:494
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:557 build/trans_presets.java:578
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:674 build/trans_presets.java:687
-#: build/trans_presets.java:700 build/trans_presets.java:713
-#: build/trans_presets.java:726 build/trans_presets.java:1280
-#: build/trans_presets.java:1463 build/trans_presets.java:1504
+#: build/trans_presets.java:215 build/trans_presets.java:233
+#: build/trans_presets.java:251 build/trans_presets.java:271
+#: build/trans_presets.java:303 build/trans_presets.java:348
+#: build/trans_presets.java:364 build/trans_presets.java:378
+#: build/trans_presets.java:402 build/trans_presets.java:421
+#: build/trans_presets.java:441 build/trans_presets.java:460
+#: build/trans_presets.java:478 build/trans_presets.java:498
+#: build/trans_presets.java:519 build/trans_presets.java:540
+#: build/trans_presets.java:561 build/trans_presets.java:582
+#: build/trans_presets.java:603 build/trans_presets.java:624
+#: build/trans_presets.java:652 build/trans_presets.java:665
+#: build/trans_presets.java:678 build/trans_presets.java:691
+#: build/trans_presets.java:704 build/trans_presets.java:717
+#: build/trans_presets.java:730 build/trans_presets.java:1284
+#: build/trans_presets.java:1467 build/trans_presets.java:1508
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -10434,5 +10481,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:214 build/trans_surveyor.java:88
+#: build/trans_presets.java:218 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "敷地内道路"
@@ -10441,5 +10488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:217
+#: build/trans_presets.java:221
 msgid "Edit Residential Street"
 msgstr "敷地内道路の編集"
@@ -10463,13 +10510,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:228 build/trans_presets.java:246
-#: build/trans_presets.java:265 build/trans_presets.java:280
-#: build/trans_presets.java:395 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1278
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:269 build/trans_presets.java:284
+#: build/trans_presets.java:399 build/trans_presets.java:419
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:477 build/trans_presets.java:496
+#: build/trans_presets.java:514 build/trans_presets.java:535
+#: build/trans_presets.java:556 build/trans_presets.java:577
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "Surface"
 msgstr "表面"
@@ -10487,40 +10534,35 @@
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Track Grade 1" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:269 build/trans_presets.java:284
+#: build/trans_presets.java:399 build/trans_presets.java:419
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:477 build/trans_presets.java:496
+#: build/trans_presets.java:514 build/trans_presets.java:535
+#: build/trans_presets.java:650 build/trans_presets.java:1282
+msgid "paved"
+msgstr "舗装"
+
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:269 build/trans_presets.java:284
+#: build/trans_presets.java:399 build/trans_presets.java:419
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:477 build/trans_presets.java:496
+#: build/trans_presets.java:650 build/trans_presets.java:1282
+msgid "unpaved"
+msgstr "未舗装"
+
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#. item "Ways/Track Grade 4" combo "Surface"
-#. item "Ways/Track Grade 5" combo "Surface"
-#. item "Ways/Path" combo "Surface"
-#. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:228 build/trans_presets.java:246
-#: build/trans_presets.java:265 build/trans_presets.java:280
-#: build/trans_presets.java:395 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1278
-msgid "paved"
-msgstr "舗装"
-
-#: build/trans_presets.java:228 build/trans_presets.java:246
-#: build/trans_presets.java:265 build/trans_presets.java:280
-#: build/trans_presets.java:395 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1278
-msgid "unpaved"
-msgstr "未舗装"
-
-#: build/trans_presets.java:228 build/trans_presets.java:246
-#: build/trans_presets.java:265 build/trans_presets.java:280
-#: build/trans_presets.java:395 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1278
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:269 build/trans_presets.java:284
+#: build/trans_presets.java:399 build/trans_presets.java:419
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:477 build/trans_presets.java:496
+#: build/trans_presets.java:514 build/trans_presets.java:535
+#: build/trans_presets.java:556 build/trans_presets.java:577
+#: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "cobblestone"
 msgstr "敷石"
@@ -10528,5 +10570,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:232
+#: build/trans_presets.java:236
 msgid "Living Street"
 msgstr "私道"
@@ -10535,5 +10577,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:235
+#: build/trans_presets.java:239
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -10541,5 +10583,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:250
+#: build/trans_presets.java:254
 msgid "Service"
 msgstr "サービス"
@@ -10548,5 +10590,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:253
+#: build/trans_presets.java:257
 msgid "Edit Serviceway"
 msgstr "サービス道路の編集"
@@ -10556,18 +10598,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:257
+#: build/trans_presets.java:261
 msgid "Serviceway type"
 msgstr "サービス路のタイプ"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:257
+#: build/trans_presets.java:261
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:257
+#: build/trans_presets.java:261
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:257
+#: build/trans_presets.java:261
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -10575,5 +10617,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:270
+#: build/trans_presets.java:274
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -10583,5 +10625,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:274
+#: build/trans_presets.java:278
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -10589,5 +10631,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:288
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -10596,5 +10638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:287
+#: build/trans_presets.java:291
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -10603,20 +10645,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:303
+#: build/trans_presets.java:307
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item
-#: build/trans_presets.java:304
+#: build/trans_presets.java:308
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:306
+#: build/trans_presets.java:310
 msgid "Toll"
 msgstr "料金"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:307
+#: build/trans_presets.java:311
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -10629,8 +10671,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:308 build/trans_presets.java:512
-#: build/trans_presets.java:533 build/trans_presets.java:554
-#: build/trans_presets.java:575 build/trans_presets.java:596
-#: build/trans_presets.java:617
+#: build/trans_presets.java:312 build/trans_presets.java:516
+#: build/trans_presets.java:537 build/trans_presets.java:558
+#: build/trans_presets.java:579 build/trans_presets.java:600
+#: build/trans_presets.java:621
 msgid "Access"
 msgstr "アクセス"
@@ -10674,23 +10716,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:634
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1364
-#: build/trans_presets.java:2304 build/trans_presets.java:2568
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2308 build/trans_presets.java:2572
 msgid "yes"
 msgstr "はい"
@@ -10703,40 +10745,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_style.java:185
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "private"
 msgstr "私道"
 
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:634
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641
 msgid "designated"
 msgstr "指定済み"
@@ -10749,19 +10791,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_style.java:192
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "destination"
 msgstr "行き先"
@@ -10784,65 +10826,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_style.java:178
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_style.java:178
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:308 build/trans_presets.java:312
-#: build/trans_presets.java:315 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619
+#: build/trans_presets.java:312 build/trans_presets.java:316
+#: build/trans_presets.java:319 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:308 build/trans_presets.java:309
-#: build/trans_presets.java:310 build/trans_presets.java:311
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
 #: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:512
-#: build/trans_presets.java:513 build/trans_presets.java:514
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:554
-#: build/trans_presets.java:555 build/trans_presets.java:556
-#: build/trans_presets.java:575 build/trans_presets.java:576
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:597 build/trans_presets.java:598
-#: build/trans_presets.java:617 build/trans_presets.java:618
-#: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:634
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1302
-#: build/trans_presets.java:1364 build/trans_presets.java:2304
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2308
+#: build/trans_presets.java:2572
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:315
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:312
+#: build/trans_presets.java:316
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -10857,10 +10899,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:839 build/trans_presets.java:872
-#: build/trans_presets.java:894 build/trans_presets.java:931
-#: build/trans_presets.java:944 build/trans_presets.java:956
-#: build/trans_presets.java:968 build/trans_presets.java:980
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:317 build/trans_presets.java:638
+#: build/trans_presets.java:843 build/trans_presets.java:876
+#: build/trans_presets.java:898 build/trans_presets.java:935
+#: build/trans_presets.java:948 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:1015
 msgid "Horse"
 msgstr "馬"
@@ -10876,13 +10918,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:314 build/trans_presets.java:513
-#: build/trans_presets.java:534 build/trans_presets.java:555
-#: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:840
-#: build/trans_presets.java:858 build/trans_presets.java:873
-#: build/trans_presets.java:895 build/trans_presets.java:932
-#: build/trans_presets.java:945 build/trans_presets.java:957
-#: build/trans_presets.java:969 build/trans_presets.java:981
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:318 build/trans_presets.java:517
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:580 build/trans_presets.java:601
+#: build/trans_presets.java:622 build/trans_presets.java:844
+#: build/trans_presets.java:862 build/trans_presets.java:877
+#: build/trans_presets.java:899 build/trans_presets.java:936
+#: build/trans_presets.java:949 build/trans_presets.java:961
+#: build/trans_presets.java:973 build/trans_presets.java:985
+#: build/trans_presets.java:1016
 msgid "Motorcycle"
 msgstr "バイク"
@@ -10898,30 +10940,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:315 build/trans_presets.java:514
-#: build/trans_presets.java:535 build/trans_presets.java:556
-#: build/trans_presets.java:577 build/trans_presets.java:598
-#: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:859 build/trans_presets.java:874
-#: build/trans_presets.java:896 build/trans_presets.java:933
-#: build/trans_presets.java:946 build/trans_presets.java:958
-#: build/trans_presets.java:970 build/trans_presets.java:982
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:319 build/trans_presets.java:518
+#: build/trans_presets.java:539 build/trans_presets.java:560
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:863 build/trans_presets.java:878
+#: build/trans_presets.java:900 build/trans_presets.java:937
+#: build/trans_presets.java:950 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:1017
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:316
+#: build/trans_presets.java:320
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:317
+#: build/trans_presets.java:321
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:318
+#: build/trans_presets.java:322
 msgid "Boat"
 msgstr "ボート"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:320
+#: build/trans_presets.java:324
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -10929,25 +10971,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:321 build/trans_presets.java:359
+#: build/trans_presets.java:325 build/trans_presets.java:363
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:326
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:323
+#: build/trans_presets.java:327
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:324
+#: build/trans_presets.java:328
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:326
+#: build/trans_presets.java:330
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -10958,5 +11000,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:331
+#: build/trans_presets.java:335
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -10978,9 +11020,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1107
-#: build/trans_presets.java:1363 build/trans_presets.java:2260
-#: build/trans_presets.java:2746 build/trans_presets.java:2756
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:338 build/trans_presets.java:635
+#: build/trans_presets.java:773 build/trans_presets.java:1111
+#: build/trans_presets.java:1367 build/trans_presets.java:2264
+#: build/trans_presets.java:2750 build/trans_presets.java:2760
+#: build/trans_presets.java:2769
 msgid "Type"
 msgstr "タイプ"
@@ -11052,10 +11094,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_presets.java:338 build/trans_style.java:509
 #: build/trans_style.java:517
 msgid "motorway"
 msgstr "高速道路"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "motorway_link"
 msgstr "高速道路のランプ"
@@ -11077,10 +11119,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_presets.java:338 build/trans_style.java:525
 #: build/trans_style.java:533
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -11102,10 +11144,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_presets.java:338 build/trans_style.java:541
 #: build/trans_style.java:549
 msgid "primary"
 msgstr "都道府県道"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "primary_link"
 msgstr "都道府県道の連絡路"
@@ -11127,5 +11169,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_presets.java:338 build/trans_style.java:557
 #: build/trans_style.java:565
 msgid "secondary"
@@ -11140,9 +11182,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:573
+#: build/trans_presets.java:338 build/trans_style.java:573
 msgid "tertiary"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "unclassified"
 msgstr "１車線道"
@@ -11156,9 +11198,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:3085
+#: build/trans_presets.java:338 build/trans_style.java:3085
 msgid "residential"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "living_street"
 msgstr "私道"
@@ -11172,9 +11214,9 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:629
+#: build/trans_presets.java:338 build/trans_style.java:629
 msgid "service"
 msgstr "サービス"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:338
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -11197,5 +11239,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_presets.java:338 build/trans_style.java:833
 #: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
@@ -11207,10 +11249,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:352
+#: build/trans_presets.java:356
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item
-#: build/trans_presets.java:364
+#: build/trans_presets.java:368
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -11218,19 +11260,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:382
 msgid "Ways"
 msgstr "ウエイ"
 
 #. group "Ways"
-#: build/trans_presets.java:379
+#: build/trans_presets.java:383
 msgid "Construction"
 msgstr "工事中"
 
 #. item
-#: build/trans_presets.java:380
+#: build/trans_presets.java:384
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:396
+#: build/trans_presets.java:400
 msgid "Junction"
 msgstr "ジャンクション"
@@ -11246,5 +11288,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:851
+#: build/trans_presets.java:400 build/trans_style.java:851
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -11253,5 +11295,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:402
+#: build/trans_presets.java:406
 msgid "Bridleway"
 msgstr "馬道"
@@ -11259,5 +11301,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:404
+#: build/trans_presets.java:408
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -11265,5 +11307,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:420
+#: build/trans_presets.java:424
 msgid "Cycleway"
 msgstr "自転車道"
@@ -11273,5 +11315,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:424
+#: build/trans_presets.java:428
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
@@ -11279,5 +11321,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:440
+#: build/trans_presets.java:444
 msgid "Footway"
 msgstr "歩道"
@@ -11286,5 +11328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:443
+#: build/trans_presets.java:447
 msgid "Edit Footway"
 msgstr "歩道の編集"
@@ -11292,5 +11334,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:459
+#: build/trans_presets.java:463
 msgid "Pedestrian"
 msgstr "ペデストリアン・歩行者用市街道路"
@@ -11299,5 +11341,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:462
+#: build/trans_presets.java:466
 msgid "Edit Pedestrian Street"
 msgstr "ペデストリアンデッキ、歩行者専用道路の編集"
@@ -11305,5 +11347,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:477
+#: build/trans_presets.java:481
 msgid "Steps"
 msgstr "階段"
@@ -11313,5 +11355,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:481
+#: build/trans_presets.java:485
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -11320,5 +11362,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:498
+#: build/trans_presets.java:502
 msgid "Track"
 msgstr "トラック"
@@ -11327,29 +11369,34 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:501
+#: build/trans_presets.java:505
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:514 build/trans_presets.java:535
+#, fuzzy
+msgid "concrete"
+msgstr "競合"
+
+#: build/trans_presets.java:514 build/trans_presets.java:556
+#: build/trans_presets.java:577
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
+#. item "Ways/Track Grade 4" combo "Surface"
+#. item "Ways/Track Grade 5" combo "Surface"
+#: build/trans_presets.java:514 build/trans_presets.java:556
+#: build/trans_presets.java:577 build/trans_presets.java:598
+#: build/trans_presets.java:619
 msgid "ground"
 msgstr "地表"
 
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:514 build/trans_presets.java:598
+#: build/trans_presets.java:619
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:510 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:514 build/trans_presets.java:556
+#: build/trans_presets.java:577 build/trans_presets.java:598
+#: build/trans_presets.java:619
 msgid "sand"
 msgstr ""
@@ -11357,5 +11404,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:518
+#: build/trans_presets.java:522
 msgid "Track Grade 1"
 msgstr "トラック グレード 1"
@@ -11364,5 +11411,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:521
+#: build/trans_presets.java:525
 msgid "Edit Track of grade 1"
 msgstr "トラック グレード 1　の編集"
@@ -11370,5 +11417,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:539
+#: build/trans_presets.java:543
 msgid "Track Grade 2"
 msgstr "トラック グレード 2"
@@ -11377,5 +11424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:542
+#: build/trans_presets.java:546
 msgid "Edit Track of grade 2"
 msgstr "トラック グレード 2の編集"
@@ -11383,5 +11430,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:560
+#: build/trans_presets.java:564
 msgid "Track Grade 3"
 msgstr "トラック グレード 3"
@@ -11390,5 +11437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:563
+#: build/trans_presets.java:567
 msgid "Edit Track of grade 3"
 msgstr "トラック グレード 3　の編集"
@@ -11396,5 +11443,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:585
 msgid "Track Grade 4"
 msgstr "トラック グレード 4"
@@ -11403,5 +11450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:584
+#: build/trans_presets.java:588
 msgid "Edit Track of grade 4"
 msgstr "トラック グレード 4　の編集"
@@ -11409,5 +11456,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:602
+#: build/trans_presets.java:606
 msgid "Track Grade 5"
 msgstr "トラック グレード 5"
@@ -11416,5 +11463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Track of grade 5"
 msgstr "トラック グレード 5 の編集"
@@ -11423,5 +11470,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:624
+#: build/trans_presets.java:628
 msgid "Path"
 msgstr "小道"
@@ -11430,13 +11477,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:627
+#: build/trans_presets.java:631
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Snowmobile"
 msgstr "スノーモービル"
 
-#: build/trans_presets.java:636
+#: build/trans_presets.java:640
 msgid "Ski"
 msgstr "スキー"
@@ -11444,5 +11491,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:651
+#: build/trans_presets.java:655
 msgid "Hiking"
 msgstr "ハイキング"
@@ -11452,5 +11499,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:655
+#: build/trans_presets.java:659
 msgid "Edit Hiking"
 msgstr "ハイキングの編集"
@@ -11458,5 +11505,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:664
+#: build/trans_presets.java:668
 msgid "Mountain Hiking"
 msgstr "山岳ハイキング"
@@ -11466,5 +11513,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:668
+#: build/trans_presets.java:672
 msgid "Edit Mountain Hiking"
 msgstr "山岳ハイキングの編集"
@@ -11472,5 +11519,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:677
+#: build/trans_presets.java:681
 msgid "Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキング"
@@ -11480,5 +11527,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:681
+#: build/trans_presets.java:685
 msgid "Edit Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキングの編集"
@@ -11486,5 +11533,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:690
+#: build/trans_presets.java:694
 msgid "Alpine Hiking"
 msgstr "高山ハイキング"
@@ -11494,5 +11541,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:694
+#: build/trans_presets.java:698
 msgid "Edit Alpine Hiking"
 msgstr "高山ハイキングの編集"
@@ -11500,5 +11547,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:703
+#: build/trans_presets.java:707
 msgid "Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキング"
@@ -11508,5 +11555,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:707
+#: build/trans_presets.java:711
 msgid "Edit Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキングの編集"
@@ -11514,5 +11561,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:716
+#: build/trans_presets.java:720
 msgid "Difficult Alpine Hiking"
 msgstr "困難な高山ハイキング"
@@ -11522,5 +11569,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:720
+#: build/trans_presets.java:724
 msgid "Edit Difficult Alpine Hiking"
 msgstr "困難な高山ハイキングの編集"
@@ -11528,10 +11575,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:734
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:731
+#: build/trans_presets.java:735
 msgid "Motorway Junction"
 msgstr "高速道路のジャンクション"
@@ -11539,15 +11586,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:733
+#: build/trans_presets.java:737
 msgid "Edit Motorway Junction"
 msgstr "高速道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:741
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:739
+#: build/trans_presets.java:743
 msgid "Services"
 msgstr "サービス"
@@ -11555,5 +11602,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:745
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -11588,14 +11635,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:883
-#: build/trans_presets.java:1354 build/trans_presets.java:1371
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2291 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2317
-#: build/trans_presets.java:2367 build/trans_presets.java:2394
-#: build/trans_presets.java:2549 build/trans_presets.java:2585
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:750 build/trans_presets.java:887
+#: build/trans_presets.java:1358 build/trans_presets.java:1375
+#: build/trans_presets.java:1382 build/trans_presets.java:1388
+#: build/trans_presets.java:1396 build/trans_presets.java:1403
+#: build/trans_presets.java:2272 build/trans_presets.java:2279
+#: build/trans_presets.java:2295 build/trans_presets.java:2306
+#: build/trans_presets.java:2314 build/trans_presets.java:2321
+#: build/trans_presets.java:2371 build/trans_presets.java:2398
+#: build/trans_presets.java:2553 build/trans_presets.java:2589
+#: build/trans_presets.java:3000
 msgid "Operator"
 msgstr "操作員"
@@ -11604,5 +11651,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:750
+#: build/trans_presets.java:754
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -11612,5 +11659,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:754
+#: build/trans_presets.java:758
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -11619,27 +11666,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:1306
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:1306
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:1306
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:1306
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:759 build/trans_presets.java:775
+#: build/trans_presets.java:1307
 msgid "Cross on horseback"
 msgstr "馬の背で横断"
@@ -11647,6 +11694,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:760 build/trans_presets.java:774
+#: build/trans_presets.java:1308
 msgid "Cross by bicycle"
 msgstr ""
@@ -11655,11 +11702,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:761 build/trans_presets.java:776
+#: build/trans_presets.java:1309
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:762
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -11667,30 +11714,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:758 build/trans_presets.java:773
+#: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:761
+#: build/trans_presets.java:765
 msgid "Stop"
 msgstr "停止"
@@ -11698,5 +11745,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:764
+#: build/trans_presets.java:768
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -11705,14 +11752,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:771
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:777
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:775
+#: build/trans_presets.java:779
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -11723,14 +11770,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:784
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:784
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:782
+#: build/trans_presets.java:786
 msgid "Turning Circle"
 msgstr "転回場"
@@ -11740,20 +11787,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:787
+#: build/trans_presets.java:791
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item
-#: build/trans_presets.java:788
+#: build/trans_presets.java:792
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:797
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:799
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -11761,5 +11808,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:798
+#: build/trans_presets.java:802
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -11767,5 +11814,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:805
 msgid "Incline"
 msgstr "坂"
@@ -11773,5 +11820,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:808
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -11780,10 +11827,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:808
+#: build/trans_presets.java:812
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item
-#: build/trans_presets.java:809
+#: build/trans_presets.java:813
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -11791,5 +11838,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:816
+#: build/trans_presets.java:820
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -11797,5 +11844,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:822
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -11807,7 +11854,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1564
-#: build/trans_presets.java:1689 build/trans_presets.java:2690
-#: build/trans_presets.java:2697 build/trans_presets.java:2704
+#: build/trans_presets.java:827 build/trans_presets.java:1568
+#: build/trans_presets.java:1693 build/trans_presets.java:2694
+#: build/trans_presets.java:2701 build/trans_presets.java:2708
 msgid "Elevation"
 msgstr "高度"
@@ -11815,5 +11862,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:831
 msgid "Barriers"
 msgstr "ゲート等"
@@ -11821,5 +11868,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:830
+#: build/trans_presets.java:834
 msgid "Bollard"
 msgstr "車止め杭"
@@ -11827,5 +11874,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:836
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -11867,15 +11914,15 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:835 build/trans_presets.java:854
-#: build/trans_presets.java:868 build/trans_presets.java:890
-#: build/trans_presets.java:927 build/trans_presets.java:940
-#: build/trans_presets.java:952 build/trans_presets.java:964
-#: build/trans_presets.java:976 build/trans_presets.java:988
-#: build/trans_presets.java:998 build/trans_presets.java:1007
+#: build/trans_presets.java:839 build/trans_presets.java:858
+#: build/trans_presets.java:872 build/trans_presets.java:894
+#: build/trans_presets.java:931 build/trans_presets.java:944
+#: build/trans_presets.java:956 build/trans_presets.java:968
+#: build/trans_presets.java:980 build/trans_presets.java:992
+#: build/trans_presets.java:1002 build/trans_presets.java:1011
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:842
+#: build/trans_presets.java:846
 msgid "Cycle Barrier"
 msgstr ""
@@ -11884,5 +11931,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:846
+#: build/trans_presets.java:850
 msgid "Block"
 msgstr "ブロック"
@@ -11891,5 +11938,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:849
+#: build/trans_presets.java:853
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -11897,5 +11944,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:855
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -11903,5 +11950,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:865
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -11909,15 +11956,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:864
+#: build/trans_presets.java:868
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:865
+#: build/trans_presets.java:869
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:880
 msgid "Toll Booth"
 msgstr "料金所"
@@ -11925,5 +11972,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:878
+#: build/trans_presets.java:882
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -11931,10 +11978,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:886
+#: build/trans_presets.java:890
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item
-#: build/trans_presets.java:887
+#: build/trans_presets.java:891
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -11944,5 +11991,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:901
+#: build/trans_presets.java:905
 msgid "Hedge"
 msgstr "生け垣"
@@ -11951,5 +11998,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:905
+#: build/trans_presets.java:909
 msgid "Fence"
 msgstr "フェンス"
@@ -11958,5 +12005,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:913
 msgid "Wall"
 msgstr "壁"
@@ -11964,5 +12011,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:912
+#: build/trans_presets.java:916
 msgid "City Wall"
 msgstr "城壁"
@@ -11971,5 +12018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:916
+#: build/trans_presets.java:920
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -11981,15 +12028,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:923
+#: build/trans_presets.java:927
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:924
+#: build/trans_presets.java:928
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:935
+#: build/trans_presets.java:939
 msgid "Gate"
 msgstr "ゲート"
@@ -11997,50 +12044,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:937
+#: build/trans_presets.java:941
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:948
+#: build/trans_presets.java:952
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item
-#: build/trans_presets.java:949
+#: build/trans_presets.java:953
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:964
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:965
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:976
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:977
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:988
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:989
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:993
+#: build/trans_presets.java:997
 msgid "Stile"
 msgstr "踏み越し段"
@@ -12048,15 +12095,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:999
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1007
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1008
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -12067,10 +12114,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1018 build/trans_presets.java:1061
+#: build/trans_presets.java:1022 build/trans_presets.java:1065
 msgid "Water"
 msgstr "湖沼・海洋"
 
 #. group "Water"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1023
 msgid "Spring"
 msgstr "泉"
@@ -12078,5 +12125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:1025
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -12084,5 +12131,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1030
 msgid "Drain"
 msgstr "側溝"
@@ -12090,10 +12137,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:1032
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1038
 msgid "Stream"
 msgstr "小川"
@@ -12101,10 +12148,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1040
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1046
 msgid "Canal"
 msgstr "運河"
@@ -12112,10 +12159,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1048
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1054
 msgid "River"
 msgstr "川"
@@ -12125,5 +12172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1058
 msgid "Edit River"
 msgstr "河川の編集"
@@ -12131,15 +12178,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1067
 msgid "Edit Water"
 msgstr "湖沼・海洋の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1071
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1072
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -12147,5 +12194,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1077
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -12153,10 +12200,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1078
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1083
 msgid "Reservoir"
 msgstr "ため池"
@@ -12164,15 +12211,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1085
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1090
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1091
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -12180,5 +12227,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1096
 msgid "Riverbank"
 msgstr "川岸"
@@ -12187,10 +12234,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1099
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1103
 msgid "Wetland"
 msgstr "湿地帯"
@@ -12201,14 +12248,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1108
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "bog"
 msgstr "湿地"
@@ -12222,35 +12269,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1107 build/trans_style.java:3326
+#: build/trans_presets.java:1111 build/trans_style.java:3326
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1111
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1113
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1114
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1118
 msgid "Beach"
 msgstr "海岸"
@@ -12258,20 +12305,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1120
 msgid "Edit Beach"
 msgstr "海岸の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1124
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1125
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1129
 msgid "Cliff"
 msgstr "崖"
@@ -12279,10 +12326,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1131
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1135
 msgid "Coastline"
 msgstr "海岸線"
@@ -12290,5 +12337,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1137
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -12296,5 +12343,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1142
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -12302,5 +12349,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1144
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -12309,5 +12356,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1152
 msgid "Boatyard"
 msgstr "ボートヤード"
@@ -12315,10 +12362,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1154
 msgid "Edit Boatyard"
 msgstr "船着き場の編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1159
 msgid "Dock"
 msgstr "ドック"
@@ -12326,5 +12373,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1161
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -12332,5 +12379,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1163
+#: build/trans_presets.java:1167
 msgid "Dam"
 msgstr "ダム"
@@ -12338,15 +12385,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1165
+#: build/trans_presets.java:1169
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1175
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1176
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -12355,5 +12402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1180
 msgid "Weir"
 msgstr "堰"
@@ -12361,20 +12408,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1182
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1187
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1188
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1189
+#: build/trans_presets.java:1193
 msgid "Turning Point"
 msgstr "転回地点"
@@ -12383,15 +12430,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1197
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1198
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1202
 msgid "Pier"
 msgstr "桟橋"
@@ -12399,10 +12446,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1204
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1208
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -12410,10 +12457,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1210
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1214
 msgid "Slipway"
 msgstr "造船台"
@@ -12423,5 +12470,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1218
 msgid "Edit Slipway"
 msgstr "造船台の編集"
@@ -12429,10 +12476,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1224
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1225
 msgid "Rail"
 msgstr "線路"
@@ -12440,5 +12487,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1227
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -12468,8 +12515,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1226 build/trans_presets.java:1232
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1288
+#: build/trans_presets.java:1230 build/trans_presets.java:1236
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1255 build/trans_presets.java:1261
+#: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -12483,35 +12530,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1226 build/trans_presets.java:1232
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1288
+#: build/trans_presets.java:1230 build/trans_presets.java:1236
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1255 build/trans_presets.java:1261
+#: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1226 build/trans_presets.java:1232
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1288
+#: build/trans_presets.java:1230 build/trans_presets.java:1236
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1255 build/trans_presets.java:1261
+#: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1226 build/trans_presets.java:1232
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1288
+#: build/trans_presets.java:1230 build/trans_presets.java:1236
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1255 build/trans_presets.java:1261
+#: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1232
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1233
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1238
 msgid "Monorail"
 msgstr "モノレール"
@@ -12519,45 +12566,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1240
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1245
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1246
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1251
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1252
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1257
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1258
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1263
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1264
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1269
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -12565,5 +12612,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1271
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -12572,14 +12619,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1288
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1285
+#: build/trans_presets.java:1289
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1294
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -12588,5 +12635,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1298
 msgid "Level Crossing"
 msgstr "踏切"
@@ -12595,5 +12642,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1302
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -12603,5 +12650,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1306
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -12609,5 +12656,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1312
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -12616,10 +12663,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1317
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1318
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -12627,10 +12674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1320
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1324
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -12638,10 +12685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1326
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1330
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -12649,10 +12696,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1332
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1336
 msgid "Gondola"
 msgstr ""
@@ -12660,12 +12707,11 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1334
-#, fuzzy
+#: build/trans_presets.java:1338
 msgid "Edit Gondola"
-msgstr "ゴルフの編集"
+msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1338 build/trans_presets.java:1426
+#: build/trans_presets.java:1342 build/trans_presets.java:1430
 msgid "Station"
 msgstr "駅"
@@ -12676,10 +12722,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1340 build/trans_presets.java:1429
+#: build/trans_presets.java:1344 build/trans_presets.java:1433
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1351
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -12689,5 +12735,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1355
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -12703,5 +12749,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1356 build/trans_presets.java:1403
+#: build/trans_presets.java:1360 build/trans_presets.java:1407
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12711,5 +12757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1363
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -12717,41 +12763,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1362 build/trans_presets.java:1408
+#: build/trans_presets.java:1366 build/trans_presets.java:1412
 msgid "Capacity"
 msgstr "収容台数"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1367
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1367
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1367
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1367
 msgid "park_and_ride"
 msgstr "パーク＆ライド"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1365 build/trans_presets.java:2304
+#: build/trans_presets.java:1369 build/trans_presets.java:2308
 msgid "Fee"
 msgstr "料金"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1371
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1372
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -12759,5 +12805,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1373 build/trans_presets.java:1417
+#: build/trans_presets.java:1377 build/trans_presets.java:1421
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -12765,15 +12811,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1379
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1384
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1385
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -12781,5 +12827,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1386 build/trans_presets.java:1410
+#: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
 msgstr "レンタル"
@@ -12788,10 +12834,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1389
+#: build/trans_presets.java:1393
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1398
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -12799,5 +12845,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -12805,5 +12851,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1405
+#: build/trans_presets.java:1409
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
@@ -12812,5 +12858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1417
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -12819,15 +12865,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1424
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1429
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1438
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -12835,5 +12881,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1441
 msgid "Railway Halt"
 msgstr "停車場"
@@ -12841,5 +12887,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1443
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -12847,5 +12893,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1450
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -12854,5 +12900,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1453
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -12860,5 +12906,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1460
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -12867,5 +12913,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1459
+#: build/trans_presets.java:1463
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -12877,5 +12923,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1462 build/trans_presets.java:1503
+#: build/trans_presets.java:1466 build/trans_presets.java:1507
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -12883,10 +12929,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1464 build/trans_presets.java:1505
+#: build/trans_presets.java:1468 build/trans_presets.java:1509
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1470
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -12895,10 +12941,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1473
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1478
 msgid "Wheelchair"
 msgstr "車いす"
@@ -12907,5 +12953,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1483
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -12914,5 +12960,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1486
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -12920,5 +12966,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1492
 msgid "Bus Stop"
 msgstr "バス停"
@@ -12928,5 +12974,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1492
+#: build/trans_presets.java:1496
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -12934,10 +12980,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1499
+#: build/trans_presets.java:1503
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1504
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -12945,5 +12991,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1512
 msgid "Taxi"
 msgstr "タクシー"
@@ -12951,5 +12997,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1514
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -12957,5 +13003,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1519
 msgid "Airport"
 msgstr "空港"
@@ -12963,15 +13009,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1521
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1526
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1527
 msgid "ICAO"
 msgstr "ICAO"
@@ -12980,5 +13026,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1532
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -12990,5 +13036,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1529 build/trans_surveyor.java:43
+#: build/trans_presets.java:1533 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -12997,15 +13043,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1536
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1539
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1541
 msgid "Motel"
 msgstr "モーテル"
@@ -13013,20 +13059,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1543
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1543
+#: build/trans_presets.java:1547
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1548
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1552
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -13034,10 +13080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1554
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1558
 msgid "Hostel"
 msgstr "ホステル"
@@ -13045,30 +13091,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1560
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1564
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1565
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1570
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1571
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -13076,10 +13122,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1582
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -13090,5 +13136,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1579 build/trans_surveyor.java:47
+#: build/trans_presets.java:1583 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -13096,5 +13142,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1585
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -13102,5 +13148,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -13108,61 +13154,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1584 build/trans_presets.java:1591
+#: build/trans_presets.java:1588 build/trans_presets.java:1595
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -13170,9 +13216,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1592
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1597
 msgid "Cafe"
 msgstr "カフェ"
@@ -13180,10 +13226,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1599
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1603
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -13191,20 +13237,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1605
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1609
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1610
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1614
 msgid "Bar"
 msgstr "バー"
@@ -13212,10 +13258,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1616
 msgid "Edit Bar"
 msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1620
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -13223,20 +13269,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1622
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1628
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
@@ -13245,11 +13291,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1628 build/trans_presets.java:1668
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:1632 build/trans_presets.java:1672
+#: build/trans_presets.java:2372
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1634
 msgid "Museum"
 msgstr "博物館"
@@ -13257,10 +13303,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1636
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1640
 msgid "Zoo"
 msgstr "動物園"
@@ -13269,10 +13315,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1643
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1647
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -13280,25 +13326,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1652
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1654
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1659
 msgid "Artwork"
 msgstr "美術館"
@@ -13306,5 +13352,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1661
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -13312,5 +13358,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1666
 msgid "Information Office"
 msgstr "案内所"
@@ -13318,70 +13364,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1668
 msgid "Edit Information Office"
 msgstr "案内所の編集"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1678
 msgid "Map Type"
 msgstr "マップタイプ"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1678
 msgid "map"
 msgstr "マップ"
 
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1678
 msgid "citymap"
 msgstr "街路地図"
 
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1678
 msgid "hikingmap"
 msgstr "ハイキングマップ"
 
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1678
 msgid "bicyclemap"
 msgstr "自転車マップ"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1679 build/trans_presets.java:1686
+#: build/trans_presets.java:1699
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1681
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1685
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1685
 msgid "board"
 msgstr "board"
 
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1685
 msgid "history"
 msgstr "ヒストリー"
 
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1685
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1685
 msgid "wildlife"
 msgstr "野生生物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1688
 msgid "Guidepost (Hiking)"
 msgstr "ガイドポスト(ハイキング)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1695
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
@@ -13391,10 +13437,10 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1698 build/trans_presets.java:2344
+#: build/trans_presets.java:1702 build/trans_presets.java:2348
 msgid "Shelter"
 msgstr "避難所"
 
 #. item
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1703
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -13402,25 +13448,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1702 build/trans_presets.java:1708
+#: build/trans_presets.java:1706 build/trans_presets.java:1712
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1708
 msgid "Picnic Site"
 msgstr "キャンプ場"
 
 #. item
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1709
 msgid "Edit Picnic Site"
 msgstr "キャンプ場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1715
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1716
 msgid "Castle"
 msgstr "城"
@@ -13429,20 +13475,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1723
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1728
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -13451,10 +13497,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1731
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1735
 msgid "Battlefield"
 msgstr "戦場"
@@ -13462,5 +13508,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1737
 msgid "Edit Battlefield"
 msgstr "戦場の編集"
@@ -13468,15 +13514,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1742
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1743
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1747
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -13484,45 +13530,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1749
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1753
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1750
+#: build/trans_presets.java:1754
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1758
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1764
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1761
+#: build/trans_presets.java:1765
 msgid "Water Park"
 msgstr "親水公園"
 
 #. item
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1766
 msgid "Edit Water Park"
 msgstr "親水公園の編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1770
 msgid "Playground"
 msgstr "遊び場"
@@ -13530,15 +13576,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1772
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1776
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1777
 msgid "Edit Fishing"
 msgstr "つりの編集"
@@ -13546,15 +13592,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1783
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1784
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1785
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -13568,6 +13614,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1785 build/trans_presets.java:1794
-#: build/trans_presets.java:1803 build/trans_presets.java:1812
+#: build/trans_presets.java:1789 build/trans_presets.java:1798
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -13943,6 +13989,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 #: build/trans_style.java:3506 build/trans_style.java:3514
 #: build/trans_style.java:3522 build/trans_style.java:3530
@@ -13975,227 +14021,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_presets.java:1791 build/trans_presets.java:1800
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1793
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1794
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Pitch"
 msgstr "ピッチ"
 
 #. item
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Edit Pitch"
 msgstr "ピッチの編集"
 
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1812
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1820
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1821
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1825
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1833
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -14234,191 +14280,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1832 build/trans_presets.java:1838
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1925
-#: build/trans_presets.java:1932 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
 msgid "pitch"
 msgstr "ピッチ"
 
-#: build/trans_presets.java:1832 build/trans_presets.java:1838
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1925
-#: build/trans_presets.java:1932 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1832 build/trans_presets.java:1838
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1925
-#: build/trans_presets.java:1932 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1839
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1844
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1845
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1846
+#: build/trans_presets.java:1850
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1851
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1856
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1857
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1862
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1863
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1868
 msgid "Cycling"
 msgstr "サイクリング"
 
 #. item
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1869
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1874
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1875
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1880
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1881
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1886
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1887
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1892
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1893
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1898
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1899
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1904
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1905
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1910
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1911
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1916
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1917
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1922
 msgid "Skiing"
 msgstr "スキー"
@@ -14426,58 +14472,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1924
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1927
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1927
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1927
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1927
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1928
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1928
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1928
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1924
-#, fuzzy
+#: build/trans_presets.java:1928
 msgid "intermediate"
-msgstr "中級"
-
-#: build/trans_presets.java:1924
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1928
 msgid "advanced"
-msgstr "上級"
-
-#: build/trans_presets.java:1924
+msgstr ""
+
+#: build/trans_presets.java:1928
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1928
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1931
 msgid "Shooting"
 msgstr "射撃"
@@ -14485,127 +14529,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1933
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1939
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1940
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1941
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1946
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1947
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1952
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1953
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1958
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1959
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1964
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1965
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1970
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1971
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1974
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1976
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1977
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1982
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1983
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1988
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1989
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1994
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:1995
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:2000
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2001
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2006
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2007
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2012
 msgid "Pelota"
 msgstr "ペロタ"
@@ -14613,51 +14657,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2013
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2018
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2019
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2024
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2025
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2030
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2031
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2036
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2037
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2044
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2045
 msgid "Building"
 msgstr "ビル"
@@ -14665,5 +14709,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2048
 msgid "Public Building"
 msgstr "公共のビル"
@@ -14671,10 +14715,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2050
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2054
 msgid "Town hall"
 msgstr "役場"
@@ -14682,10 +14726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2056
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2060
 msgid "Embassy"
 msgstr "大使館"
@@ -14693,10 +14737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2062
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2066
 msgid "Courthouse"
 msgstr "裁判所"
@@ -14705,10 +14749,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2069
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2073
 msgid "Prison"
 msgstr "刑務所"
@@ -14717,10 +14761,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2076
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2080
 msgid "Police"
 msgstr "警察"
@@ -14730,10 +14774,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2084
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2088
 msgid "Fire Station"
 msgstr "消防署"
@@ -14742,10 +14786,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2091
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2095
 msgid "Post Office"
 msgstr "郵便局"
@@ -14753,5 +14797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2097
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -14759,15 +14803,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2102
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2103
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2107
 msgid "School"
 msgstr "学校"
@@ -14775,10 +14819,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2109
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2113
 msgid "University"
 msgstr "大学"
@@ -14786,10 +14830,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2115
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2119
 msgid "College"
 msgstr "短大"
@@ -14797,5 +14841,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2121
 msgid "Edit College"
 msgstr "短大の編集"
@@ -14803,5 +14847,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2126
 msgid "Cinema"
 msgstr "映画館"
@@ -14810,10 +14854,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2129
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2133
 msgid "Library"
 msgstr "図書館"
@@ -14822,10 +14866,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2136
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2140
 msgid "Arts Centre"
 msgstr "美術館"
@@ -14833,10 +14877,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2142
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2146
 msgid "Theatre"
 msgstr "劇場"
@@ -14845,10 +14889,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2149
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2153
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -14858,5 +14902,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2157
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -14865,75 +14909,74 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "Religion"
-msgstr "地域"
+msgstr "宗教"
 
 #. item "Buildings/Place of Worship" combo "Religion"
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
-#, fuzzy
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "unitarian"
-msgstr "ユニテリアン"
-
-#: build/trans_presets.java:2156 build/trans_presets.java:2877
-#: build/trans_presets.java:2886
+msgstr ""
+
+#: build/trans_presets.java:2160 build/trans_presets.java:2881
+#: build/trans_presets.java:2890
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "Denomination"
 msgstr "宗派"
@@ -14942,81 +14985,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2157 build/trans_presets.java:2878
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2164
 msgid "Addresses"
 msgstr "住所"
@@ -15025,5 +15068,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2167
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -15031,5 +15074,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2169
 msgid "House number"
 msgstr "いえ番号"
@@ -15037,20 +15080,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2171
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2173
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2174
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2175
 msgid "Country code"
 msgstr "国コード"
@@ -15058,5 +15101,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2178
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -15065,5 +15108,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2181
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -15071,72 +15114,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2183
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2183
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2183
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2183
 msgid "all"
 msgstr "全て"
 
-#: build/trans_presets.java:2179
-#, fuzzy
+#: build/trans_presets.java:2183
 msgid "alphabetic"
-msgstr "アスレチック"
-
-#: build/trans_presets.java:2182
+msgstr ""
+
+#: build/trans_presets.java:2186
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2187
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2188
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2192
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2193
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2197
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2198
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2202
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2203
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2207
 msgid "Lighthouse"
 msgstr "灯台"
@@ -15144,10 +15186,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2209
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2213
 msgid "Windmill"
 msgstr "風車"
@@ -15155,10 +15197,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2215
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2219
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -15166,10 +15208,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2221
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2225
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -15179,10 +15221,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2229
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2233
 msgid "Crane"
 msgstr "クレーン"
@@ -15190,10 +15232,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2235
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2239
 msgid "Beacon"
 msgstr "ビーコン"
@@ -15201,10 +15243,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2241
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2245
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -15212,10 +15254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2247
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2251
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -15223,5 +15265,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2253
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -15229,5 +15271,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2258
 msgid "Power Generator"
 msgstr "発電機"
@@ -15237,39 +15279,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2262
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2264
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2267
 msgid "Power Station"
 msgstr "変電所"
@@ -15278,10 +15320,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2270
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2274
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -15290,5 +15332,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2277
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -15296,10 +15338,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2276 build/trans_presets.java:2292
+#: build/trans_presets.java:2280 build/trans_presets.java:2296
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2282
 msgid "Power Tower"
 msgstr "送電塔"
@@ -15310,5 +15352,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2287
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -15316,5 +15358,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2290
 msgid "Power Line"
 msgstr "送電線"
@@ -15323,25 +15365,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2293
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2297
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2298
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2301
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2302
 msgid "Toilets"
 msgstr "トイレ"
@@ -15349,20 +15391,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2303 build/trans_presets.java:2395
+#: build/trans_presets.java:2307 build/trans_presets.java:2399
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2305 build/trans_presets.java:2396
+#: build/trans_presets.java:2309 build/trans_presets.java:2400
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2311
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2316
 msgid "Telephone"
 msgstr "電話"
@@ -15371,5 +15413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2319
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -15377,5 +15419,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2318 build/trans_presets.java:2397
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Coins"
 msgstr "コイン"
@@ -15383,5 +15425,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2319 build/trans_presets.java:2398
+#: build/trans_presets.java:2323 build/trans_presets.java:2402
 msgid "Notes"
 msgstr "備考"
@@ -15389,5 +15431,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2320 build/trans_presets.java:2399
+#: build/trans_presets.java:2324 build/trans_presets.java:2403
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -15395,5 +15437,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -15401,15 +15443,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2326 build/trans_presets.java:2405
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2327
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2329
 msgid "Recycling"
 msgstr "リサイクル"
@@ -15418,5 +15460,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2332
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -15424,35 +15466,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2334
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2335
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2336
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2337
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2338
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2339
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2341
 msgid "Bench"
 msgstr "ベンチ"
@@ -15461,20 +15503,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2345
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2346
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2349
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2350
 msgid "Lock"
 msgstr "ロック"
@@ -15482,22 +15524,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2347 build/trans_presets.java:2747
+#: build/trans_presets.java:2351 build/trans_presets.java:2751
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2351
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2351
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2351
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2353
 msgid "Fountain"
 msgstr "噴水"
@@ -15506,10 +15548,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2356
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2360
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -15518,10 +15560,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2363
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2367
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -15529,25 +15571,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2369
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2375
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2376
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2377
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2381
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -15555,10 +15597,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2383
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2387
 msgid "Kiosk"
 msgstr "キオスク"
@@ -15566,10 +15608,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2389
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2393
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -15577,5 +15619,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2395
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -15583,88 +15625,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2397
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2406
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2408
 msgid "Butcher"
 msgstr "精肉店"
@@ -15672,10 +15714,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2410
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2414
 msgid "Baker"
 msgstr "パン屋"
@@ -15683,10 +15725,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2416
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2420
 msgid "Florist"
 msgstr "生花店"
@@ -15694,84 +15736,81 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2422
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2426
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2427
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2427
-#, fuzzy
+#: build/trans_presets.java:2431
 msgid "Alcohol"
-msgstr "学校"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2429
-#, fuzzy
+#: build/trans_presets.java:2433
 msgid "Edit Alcohol Shop"
-msgstr "靴店の編集"
+msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2437
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2438
 msgid "Edit Beverages Shop"
-msgstr "飲料店の編集"
+msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2442
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2443
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2447
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2448
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2452
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2453
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2457
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2458
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2462
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -15779,10 +15818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2464
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2468
 msgid "Hardware"
 msgstr "金物屋"
@@ -15790,10 +15829,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2470
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2474
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -15801,60 +15840,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2476
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2480
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2481
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2485
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2486
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2490
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2491
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2495
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2496
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2500
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2501
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2505
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -15862,10 +15901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2507
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2511
 msgid "Laundry"
 msgstr "ランドリー"
@@ -15873,10 +15912,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2513
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2517
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -15884,37 +15923,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2519
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2519
-#, fuzzy
+#: build/trans_presets.java:2523
 msgid "Sports"
-msgstr "スポーツ"
-
-#. item
-#: build/trans_presets.java:2520
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2524
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2524
-#, fuzzy
+#: build/trans_presets.java:2528
 msgid "Optician"
-msgstr "眼鏡屋"
-
-#. item
-#: build/trans_presets.java:2525
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2529
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2535
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2536
 msgid "Bank"
 msgstr "銀行"
@@ -15922,5 +15959,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2538
 msgid "Edit Bank"
 msgstr "銀行の編集"
@@ -15928,10 +15965,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2537 build/trans_presets.java:2545
+#: build/trans_presets.java:2541 build/trans_presets.java:2549
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2543
 msgid "Money Exchange"
 msgstr "両替"
@@ -15939,5 +15976,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2545
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -15945,15 +15982,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2551
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2556
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2557
 msgid "Doctors"
 msgstr "医院"
@@ -15961,20 +15998,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2559
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2563
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2564
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2568
 msgid "Pharmacy"
 msgstr "薬局"
@@ -15982,5 +16019,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2570
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -15988,10 +16025,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2572
 msgid "Dispensing"
 msgstr "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2575
 msgid "Hospital"
 msgstr "病院"
@@ -15999,10 +16036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2577
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2581
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -16011,5 +16048,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2584
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -16018,20 +16055,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2587
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2588
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2590
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2591
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -16039,5 +16076,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2594
 msgid "Veterinary"
 msgstr "動物病院"
@@ -16046,25 +16083,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2597
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2604
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2605
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2610
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2611
 msgid "Edit Country"
 msgstr "国(country)の編集"
@@ -16072,30 +16109,30 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2612 build/trans_presets.java:2997
+#: build/trans_presets.java:2616 build/trans_presets.java:3001
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2617
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2622
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2623
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2628
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2629
 msgid "Edit County"
 msgstr "郡の編集"
@@ -16103,15 +16140,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2635
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2636
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2641
 msgid "Town"
 msgstr "町"
@@ -16119,10 +16156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2643
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2648
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -16130,25 +16167,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2650
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2655
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2656
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2661
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2662
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -16156,5 +16193,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2668
 msgid "Locality"
 msgstr "地域"
@@ -16162,10 +16199,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2670
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2675
 msgid "Island"
 msgstr "島"
@@ -16173,5 +16210,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2677
 msgid "Edit Island"
 msgstr "島の編集"
@@ -16179,5 +16216,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2683
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -16185,10 +16222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2685
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2689
 msgid "Peak"
 msgstr "山頂"
@@ -16196,10 +16233,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2691
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2696
 msgid "Glacier"
 msgstr "氷河"
@@ -16207,10 +16244,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2698
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2703
 msgid "Volcano"
 msgstr "火山"
@@ -16218,70 +16255,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2705
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2711
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2712
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2713
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2718
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2719
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2724
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2725
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2730
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2731
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2736
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2737
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2743
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2744
 msgid "Tree"
 msgstr "樹木・林"
@@ -16290,15 +16327,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2747
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2752
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2754
 msgid "Wood"
 msgstr "森"
@@ -16307,5 +16344,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2757
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -16313,17 +16350,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2762
 msgid "Forest"
 msgstr "森"
@@ -16332,14 +16369,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2765
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2771
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2772
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -16347,25 +16384,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2777
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2778
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2782
 msgid "Scrub"
 msgstr "低木林"
 
 #. item
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2783
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2787
 msgid "Fell"
 msgstr "山(Fell)"
@@ -16373,10 +16410,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2789
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2793
 msgid "Heath"
 msgstr "荒れ地"
@@ -16384,5 +16421,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2795
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -16390,5 +16427,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2800
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -16397,45 +16434,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2803
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2808
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2809
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2814
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2815
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2820
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2821
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2826
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2827
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -16443,25 +16480,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2833
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2834
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2838
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2839
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2844
 msgid "Village Green"
 msgstr "里山"
@@ -16469,5 +16506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2846
 msgid "Edit Village Green Landuse"
 msgstr ""
@@ -16476,5 +16513,5 @@
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2851
 msgid "Common"
 msgstr "共有地"
@@ -16482,20 +16519,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2853
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2857
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2858
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2862
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -16503,5 +16540,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2864
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -16509,15 +16546,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2870
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2871
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2876
 msgid "Graveyard"
 msgstr "墓所"
@@ -16525,9 +16562,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2878
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2884
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -16535,39 +16572,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2886
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2893
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2894
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2899
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2900
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2905
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2906
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2911
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -16575,15 +16612,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2913
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2918
 msgid "Military"
 msgstr "軍用"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2919
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -16591,55 +16628,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:2925
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2926
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2931
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2932
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2937
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2938
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2943
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2944
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2949
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2950
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2959
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -16649,5 +16686,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2963
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -16656,10 +16693,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2969
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2970
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -16667,5 +16704,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2973
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -16674,5 +16711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2976
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -16680,34 +16717,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2978
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -16716,15 +16753,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2983
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2984
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2985
 msgid "to way"
 msgstr "ウエイへ"
@@ -16732,5 +16769,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2988
 msgid "Route"
 msgstr "ルート"
@@ -16739,5 +16776,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2991
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -16745,5 +16782,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "Route type"
 msgstr "ルート種類"
@@ -16815,5 +16852,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_presets.java:2993 build/trans_style.java:206
 #: build/trans_style.java:645 build/trans_style.java:862
 #: build/trans_style.java:870 build/trans_style.java:878
@@ -16822,17 +16859,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "ski"
 msgstr "スキー"
@@ -16887,5 +16924,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_presets.java:2993 build/trans_style.java:220
 #: build/trans_style.java:653 build/trans_style.java:661
 #: build/trans_style.java:669 build/trans_style.java:672
@@ -16894,13 +16931,13 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2993
 msgid "detour"
 msgstr "迂回路"
@@ -16914,10 +16951,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2989 build/trans_style.java:1162
+#: build/trans_presets.java:2993 build/trans_style.java:1162
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2996
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -16925,26 +16962,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:2999
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3001
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3001
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3001
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3001
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3002
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -16953,30 +16990,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3005
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3006
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3007
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3008
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3009
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3010
 msgid "backward halt point"
 msgstr ""
@@ -17647,7 +17684,6 @@
 #: build/trans_style.java:437 build/trans_style.java:438
 #: build/trans_style.java:451 build/trans_style.java:452
-#, fuzzy
 msgid "barrier"
-msgstr "ゲート等"
+msgstr ""
 
 #. color tertiary
@@ -17817,7 +17853,6 @@
 #. <condition k="highway" v="services"/>
 #: build/trans_style.java:802
-#, fuzzy
 msgid "services"
-msgstr "サービス"
+msgstr ""
 
 #. color services
@@ -17830,7 +17865,6 @@
 #. <condition k="highway" v="ford"/>
 #: build/trans_style.java:810
-#, fuzzy
 msgid "ford"
-msgstr "浅瀬（洗い越し）"
+msgstr ""
 
 #. color ford
@@ -17863,7 +17897,6 @@
 #. <icon src="misc/no_icon.png"/>
 #: build/trans_style.java:842
-#, fuzzy
 msgid "emergency_access_point"
-msgstr "夜間急病センター"
+msgstr ""
 
 #. color water
@@ -18408,7 +18441,6 @@
 #. color piste_expert
 #: build/trans_style.java:1370 build/trans_style.java:1371
-#, fuzzy
 msgid "piste_expert"
-msgstr "フリースタイルのゲレンデ"
+msgstr ""
 
 #. color piste_expert
@@ -20965,10 +20997,10 @@
 #: build/trans_validator.java:51
 msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "bicycleタグつきの自転車道"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:52
 msgid "footway with tag foot"
-msgstr ""
+msgstr "footタグつきの歩道"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -20977,5 +21009,5 @@
 #: build/trans_validator.java:55
 msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "自転車道のレーンとしてウェイを分離する"
 
 #. way  : W : highway == cycleway && cycleway == lane
@@ -20994,5 +21026,5 @@
 #: build/trans_validator.java:62
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "+ sign付きのlayerタグ"
 
 #. *    : W : layer == /\+.*/
@@ -21036,5 +21068,5 @@
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr "Aerial Mapを開く"
+msgstr "オープンエアリアルマップ"
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg
@@ -21061,5 +21093,5 @@
 #: build/trans_wms.java:15
 msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
+msgstr "米Yahoo (GNOME Fix)"
 
 #. yahoo://gnome-web-photo-fixed {0}
@@ -21071,5 +21103,5 @@
 #: build/trans_wms.java:17
 msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
+msgstr "米Yahoo (WebKit GTK)"
 
 #. yahoo://webkit-image-gtk {0}
@@ -21084,15 +21116,13 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#, fuzzy
-#~ msgid "..."
-#~ msgstr "開く..."
-
-#, fuzzy
-#~ msgid "${plugin.description}"
-#~ msgstr "説明"
-
 #~ msgid "Commit comment"
 #~ msgstr "コメントを反映します"
 
+#~ msgid "Navigation"
+#~ msgstr "ナビゲーション"
+
+#~ msgid "Charge"
+#~ msgstr "料金"
+
 #~ msgid "Server does not support changesets"
 #~ msgstr "サーバは変更した設定をサポートしていません"
@@ -21100,16 +21130,4 @@
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "エラーのため転送が中断しました（５秒待ちます）："
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
-
-#~ msgid "Navigation"
-#~ msgstr "ナビゲーション"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "ルートノードの削除"
-
-#~ msgid "Start routing"
-#~ msgstr "ルーティングの開始"
 
 # http://en.wikipedia.org/wiki/Draw_bridge
@@ -21117,21 +21135,27 @@
 #~ msgstr "跳ね橋"
 
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
+
+# http://en.wikipedia.org/wiki/Portcullis
+#~ msgid "Portcullis"
+#~ msgstr "城の格子戸"
+
+#~ msgid "viaduct"
+#~ msgstr "高架橋"
+
+#~ msgid "sports"
+#~ msgstr "スポーツ店"
+
 # http://en.wikipedia.org/wiki/Draw_bridge
 #~ msgid "Edit Drawbridge"
 #~ msgstr "跳ね橋の編集"
 
-# http://en.wikipedia.org/wiki/Portcullis
-#~ msgid "Portcullis"
-#~ msgstr "城の格子戸"
-
 #~ msgid "Edit Portcullis"
 #~ msgstr "城の格子戸の編集"
 
-#~ msgid "Charge"
-#~ msgstr "料金"
-
-#~ msgid "sports"
-#~ msgstr "スポーツ店"
-
-#~ msgid "viaduct"
-#~ msgstr "高架橋"
+#~ msgid "Remove route nodes"
+#~ msgstr "ルートノードの削除"
+
+#~ msgid "Start routing"
+#~ msgstr "ルーティングの開始"
