Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 21414)
+++ applications/editors/josm/i18n/po/ja.po	(revision 21557)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-22 23:46+0200\n"
-"PO-Revision-Date: 2010-05-19 11:34+0000\n"
-"Last-Translator: ribbon <Unknown>\n"
+"POT-Creation-Date: 2010-06-01 20:08+0200\n"
+"PO-Revision-Date: 2010-05-28 03:57+0000\n"
+"Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\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: 2010-05-22 21:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 17:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -72,10 +72,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
@@ -264,5 +264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
@@ -273,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -279,5 +279,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:300
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -432,4 +432,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
@@ -439,8 +440,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:929
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -542,5 +543,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
@@ -654,5 +655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -665,5 +666,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -708,17 +709,17 @@
 msgstr "地図データをOSMサーバからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
 msgid "Download object..."
 msgstr "オブジェクトをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
 msgid "Download OSM object by ID."
 msgstr "OSM オブジェクトをIDでダウンロード。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
 msgid "Download Object..."
 msgstr "オブジェクトをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77
@@ -726,52 +727,56 @@
 msgstr "新規レイヤーを作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "新しいレイヤーにデータをダウンロードするなら選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
 msgid "Download referrers"
 msgstr "リファラーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
 msgid "Select if the referrers of the object should be downloaded as well"
 msgstr "オブジェクトのリファラーも同様にダウンロードが必要な場合は選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86
 msgid "Object type:"
 msgstr "オブジェクト種別:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58
 msgid "Choose the OSM object type"
 msgstr "OSMオブジェクトタイプを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Object ID:"
 msgstr "オブジェクトID:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65
 msgid "Enter the ID of the object that should be downloaded"
 msgstr "ダウンロードするオブジェクトのIDを入力"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
 msgid "Download Object"
 msgstr "オブジェクトをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "オブジェクトをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
 msgid "Start downloading"
 msgstr "ダウンロードを開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "ダイアログを閉じてダウンロードをキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
+msgid "Invalid ID specified. Cannot download object."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -789,5 +794,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376
 msgid "Duplicate"
 msgstr "複製"
@@ -1045,5 +1050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
 msgid "URL"
 msgstr "URL"
@@ -1172,23 +1177,19 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
-#, fuzzy
 msgid "Move Node..."
-msgstr "ノードを追加..."
+msgstr "ノードを移動..."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
-#, fuzzy
 msgid "Edit latitude and longitude of a node."
-msgstr "緯度経度を指定して、ノードを追加"
+msgstr "ノードの緯度経度の編集。"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
-#, fuzzy
 msgid "New Layer"
-msgstr "レイヤーを保存"
+msgstr "新規レイヤー"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#, fuzzy
 msgid "Create a new map layer."
-msgstr "新しい地図を作成します。"
+msgstr "新しいマップレイヤを作成"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1434,5 +1435,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380
 msgid "Redo"
 msgstr "やり直し"
@@ -1472,5 +1473,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1127
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
@@ -1484,6 +1485,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:779
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1512,5 +1513,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
@@ -1894,5 +1895,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Undo"
 msgstr "取り消し"
@@ -1940,5 +1941,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1002
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "Download data"
 msgstr "データのダウンロード"
@@ -2163,18 +2164,18 @@
 msgstr "この範囲ではデータは見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:67
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "ダウンロード {1}のうち{0} (残り {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
 msgid "Updating data"
 msgstr "データ更新中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:147
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:148
 msgid "Check on the server"
 msgstr "サーバでチェック"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:149
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
@@ -2184,38 +2185,50 @@
 "されているかどうかチェック"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:153
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:116
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:155
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:156
 msgid "Click to abort and to resume editing"
 msgstr "クリックして編集を中断および再開"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:160
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
-"バーでは削除されています。これらをあとで削除したり、更新しようとすると、サー"
-"バーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミティブの"
-"状態を確認するには<br><strong>{1}</strong>をクリックしてください。 <br>無視す"
-"るには、<strong>{2}</strong>をクリックしてください。<br></html>"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
+#, java-format
+msgid ""
+"There is {0} object in your local dataset which might be deleted on the "
+"server. If you later try to delete or update this the server is likely to "
+"report a conflict."
+msgid_plural ""
+"There are {0} objects in your local dataset which might be deleted on the "
+"server. If you later try to delete or update them the server is likely to "
+"report a conflict."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
+#, java-format
+msgid ""
+"Click <strong>{0}</strong> to check the state of this object on the server."
+msgid_plural ""
+"Click <strong>{0}</strong> to check the state of these objects on the server."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
-msgid "Deleted or moved primitives"
-msgstr "削除または移動されたプリミティブ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:239
+#, java-format
+msgid "Click <strong>{0}</strong> to ignore.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
+msgid "Deleted or moved objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244
 #, java-format
 msgid "The following errors occurred during mass download: {0}"
 msgstr "一括ダウンロード中に次のエラーが発生: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:240
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Errors during Download"
@@ -2392,7 +2405,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
@@ -2716,5 +2729,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "検索"
@@ -2897,6 +2910,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
@@ -2908,5 +2921,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:299
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -3015,5 +3028,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
 msgid "Double conflict"
 msgstr "二重の競合"
@@ -3100,7 +3113,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
-#, fuzzy, java-format
+#, java-format
 msgid "Deleted ''{0}''"
-msgstr "ノード {0} を削除"
+msgstr ""
 
 #. leave message in one tr() as there is a grammatical
@@ -3699,5 +3712,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3707,6 +3720,6 @@
 #. light cyan
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3716,8 +3729,8 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:373
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3752,81 +3765,81 @@
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
 msgid "Area style way is not closed."
 msgstr "領域を指定するウェイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:267
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:273
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:279
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:284
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:298
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:301
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:311
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:315
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "No \"via\" node or way found."
 msgstr "経由地かウェイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:324
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:363
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:457
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:529
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
 #, java-format
 msgid "Warning: {0}"
@@ -3843,27 +3856,32 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
+#, fuzzy
+msgid "Relation: selected"
+msgstr "リレーションは削除されました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
 msgid "Node: standard"
 msgstr "ノード: 標準"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
 msgid "Node: connection"
 msgstr "ノード: 接続"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
 msgid "Node: tagged"
 msgstr "ノード: タグ付き"
 
 #. teal
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
 msgid "untagged way"
 msgstr "タグ付いていないウェイ"
 
 #. dark green
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 msgid "incomplete way"
 msgstr "不完全なウェイ"
 
 #. darker blue
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
@@ -3871,18 +3889,18 @@
 msgstr "背景"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 msgid "highlight"
 msgstr "ハイライト"
 
 #. lighteal
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:26
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
 msgid "text"
 msgstr "テキスト"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:28
 msgid "areatext"
 msgstr "エリアテキスト"
@@ -4014,5 +4032,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:294
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4022,34 +4040,36 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:165
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232
 msgid "incomplete"
 msgstr "不完全"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:348
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354
 msgid "highway"
 msgstr "道路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:349
-#: build/trans_presets.java:3214
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
+#: build/trans_presets.java:3242
 msgid "railway"
 msgstr "鉄道"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:350
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
 msgid "waterway"
 msgstr "水路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:351
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
+#. note: length == 0 should no longer happen, but leave the bracket code
+#. nevertheless, who knows what future brings
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:794
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
@@ -4059,5 +4079,5 @@
 msgstr[0] "{0} 個のノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173
 msgid "public transport"
 msgstr "公共輸送機関"
@@ -4116,5 +4136,5 @@
 #. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
@@ -4123,6 +4143,6 @@
 msgstr "建物"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:401
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411
 #, java-format
 msgid "{0} member"
@@ -4130,5 +4150,5 @@
 msgstr[0] "{0}  個のメンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:242
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4441,5 +4461,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:650
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 msgid "Edit"
 msgstr "編集"
@@ -5112,5 +5132,6 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-msgstr[1] ""
+"{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除されてい"
+"ます。<br><br>このノードも削除を取り消しますか？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -5127,5 +5148,6 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-msgstr[1] ""
+"{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上から"
+"削除されています。<br><br>これも削除を取り消しますか？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
@@ -5396,5 +5418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
@@ -5409,5 +5431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2311
 msgid "all"
 msgstr "全て"
@@ -5486,5 +5508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:707
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:790
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
@@ -5495,5 +5517,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:715
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:798
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
@@ -5677,5 +5699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:236
 msgid "Command Stack"
 msgstr "指示の集積"
@@ -5691,5 +5713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
@@ -5704,18 +5726,16 @@
 msgstr "トグル: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:314
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:385
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
 msgid "Undo the selected and all later commands"
-msgstr "選択中の経由地をクリップボードにコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:391
-#, fuzzy
+msgstr "選択したものおよびその後のコマンドを全て取り消す"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:381
 msgid "Redo the selected and all earlier commands"
-msgstr "選択されたアイコンパスを削除"
+msgstr "選択したものおよびそれ以前のコマンドを全てやり直す"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
@@ -5737,5 +5757,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
 msgid ""
@@ -5796,5 +5816,5 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5881,7 +5901,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43
-#, fuzzy
 msgid "Advanced object info"
-msgstr "{0} 個のオブジェクトを追加しました"
+msgstr "詳細なオブジェクト情報"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
@@ -5972,9 +5991,8 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:3188
 msgid "Relations"
 msgstr "リレーション"
@@ -5997,5 +6015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
@@ -6022,10 +6040,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:751
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:842
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:753
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:844
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
@@ -6036,29 +6054,47 @@
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
 msgid "Search for objects"
 msgstr "オブジェクトを検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:354
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:388
 msgid "Zoom to selected element(s)"
 msgstr "選択した要素にズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:429
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
+msgid "Call editor for relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
+msgid "Call relation editor for selected relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+msgid "Select in relation list"
+msgstr "関連リストから選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+msgid "Select relation in relation list."
+msgstr "リレーション一覧のリレーションを選択。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:495
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
@@ -6066,22 +6102,21 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:506
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:717
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:808
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:879
 msgid "Get detailed information on the internal state of the objects."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:789
-#, fuzzy
+msgstr "オブジェクトに内部状態に関して詳細な情報を取得。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:880
 msgid "Inspect"
-msgstr "設定解除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
@@ -7102,155 +7137,158 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#. item "Relations/Boundary" label "Edit Boundary"
+#. <key key="type" value="boundary" />
+#. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:78 build/trans_presets.java:114
-#: build/trans_presets.java:154 build/trans_presets.java:191
-#: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:336 build/trans_presets.java:355
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:439 build/trans_presets.java:454
-#: build/trans_presets.java:477 build/trans_presets.java:506
-#: build/trans_presets.java:526 build/trans_presets.java:549
-#: build/trans_presets.java:571 build/trans_presets.java:590
-#: build/trans_presets.java:609 build/trans_presets.java:627
-#: build/trans_presets.java:636 build/trans_presets.java:694
-#: build/trans_presets.java:720 build/trans_presets.java:729
-#: build/trans_presets.java:789 build/trans_presets.java:940
-#: build/trans_presets.java:948 build/trans_presets.java:956
-#: build/trans_presets.java:964 build/trans_presets.java:972
-#: build/trans_presets.java:982 build/trans_presets.java:990
-#: build/trans_presets.java:995 build/trans_presets.java:1002
-#: build/trans_presets.java:1009 build/trans_presets.java:1014
-#: build/trans_presets.java:1022 build/trans_presets.java:1031
-#: build/trans_presets.java:1037 build/trans_presets.java:1043
-#: build/trans_presets.java:1048 build/trans_presets.java:1054
-#: build/trans_presets.java:1060 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1085
-#: build/trans_presets.java:1093 build/trans_presets.java:1106
-#: build/trans_presets.java:1112 build/trans_presets.java:1121
-#: build/trans_presets.java:1127 build/trans_presets.java:1133
-#: build/trans_presets.java:1141 build/trans_presets.java:1238
-#: build/trans_presets.java:1289 build/trans_presets.java:1295
-#: build/trans_presets.java:1301 build/trans_presets.java:1307
-#: build/trans_presets.java:1313 build/trans_presets.java:1319
-#: build/trans_presets.java:1332 build/trans_presets.java:1356
-#: build/trans_presets.java:1371 build/trans_presets.java:1377
-#: build/trans_presets.java:1385 build/trans_presets.java:1392
-#: build/trans_presets.java:1401 build/trans_presets.java:1409
-#: build/trans_presets.java:1420 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1460
-#: build/trans_presets.java:1472 build/trans_presets.java:1483
-#: build/trans_presets.java:1503 build/trans_presets.java:1512
-#: build/trans_presets.java:1568 build/trans_presets.java:1585
-#: build/trans_presets.java:1592 build/trans_presets.java:1597
-#: build/trans_presets.java:1603 build/trans_presets.java:1609
-#: build/trans_presets.java:1614 build/trans_presets.java:1620
-#: build/trans_presets.java:1626 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
-#: build/trans_presets.java:1657 build/trans_presets.java:1663
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1700 build/trans_presets.java:1707
-#: build/trans_presets.java:1713 build/trans_presets.java:1720
-#: build/trans_presets.java:1727 build/trans_presets.java:1734
-#: build/trans_presets.java:1751 build/trans_presets.java:1759
-#: build/trans_presets.java:1774 build/trans_presets.java:1784
-#: build/trans_presets.java:1796 build/trans_presets.java:1803
-#: build/trans_presets.java:1809 build/trans_presets.java:1819
-#: build/trans_presets.java:1824 build/trans_presets.java:1832
-#: build/trans_presets.java:1839 build/trans_presets.java:1845
-#: build/trans_presets.java:1851 build/trans_presets.java:1857
-#: build/trans_presets.java:1862 build/trans_presets.java:1867
-#: build/trans_presets.java:1872 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1890
-#: build/trans_presets.java:1899 build/trans_presets.java:1908
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: 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:2040
-#: build/trans_presets.java:2049 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2069
-#: build/trans_presets.java:2075 build/trans_presets.java:2081
-#: build/trans_presets.java:2087 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:2129
-#: build/trans_presets.java:2135 build/trans_presets.java:2141
-#: build/trans_presets.java:2147 build/trans_presets.java:2153
-#: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2179 build/trans_presets.java:2186
-#: build/trans_presets.java:2193 build/trans_presets.java:2201
-#: build/trans_presets.java:2208 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2227
-#: build/trans_presets.java:2233 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2254
-#: build/trans_presets.java:2261 build/trans_presets.java:2268
-#: build/trans_presets.java:2276 build/trans_presets.java:2308
-#: build/trans_presets.java:2313 build/trans_presets.java:2323
-#: build/trans_presets.java:2328 build/trans_presets.java:2334
-#: build/trans_presets.java:2340 build/trans_presets.java:2357
-#: build/trans_presets.java:2363 build/trans_presets.java:2369
-#: build/trans_presets.java:2375 build/trans_presets.java:2381
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2500 build/trans_presets.java:2507
-#: build/trans_presets.java:2528 build/trans_presets.java:2536
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2580 build/trans_presets.java:2587
-#: build/trans_presets.java:2594 build/trans_presets.java:2600
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2619 build/trans_presets.java:2625
-#: build/trans_presets.java:2631 build/trans_presets.java:2637
-#: build/trans_presets.java:2644 build/trans_presets.java:2651
-#: build/trans_presets.java:2658 build/trans_presets.java:2664
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2682 build/trans_presets.java:2688
-#: build/trans_presets.java:2695 build/trans_presets.java:2702
-#: build/trans_presets.java:2709 build/trans_presets.java:2715
-#: build/trans_presets.java:2721 build/trans_presets.java:2746
-#: build/trans_presets.java:2755 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2784
-#: build/trans_presets.java:2791 build/trans_presets.java:2811
-#: build/trans_presets.java:2822 build/trans_presets.java:2828
-#: build/trans_presets.java:2834 build/trans_presets.java:2840
-#: build/trans_presets.java:2846 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2901 build/trans_presets.java:2908
-#: build/trans_presets.java:2914 build/trans_presets.java:2921
-#: build/trans_presets.java:2928 build/trans_presets.java:2937
-#: build/trans_presets.java:2943 build/trans_presets.java:2949
-#: build/trans_presets.java:2955 build/trans_presets.java:2961
-#: build/trans_presets.java:2970 build/trans_presets.java:2980
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3001 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3027 build/trans_presets.java:3033
-#: build/trans_presets.java:3039 build/trans_presets.java:3045
-#: build/trans_presets.java:3051 build/trans_presets.java:3057
-#: build/trans_presets.java:3063 build/trans_presets.java:3070
-#: build/trans_presets.java:3076 build/trans_presets.java:3081
-#: build/trans_presets.java:3088 build/trans_presets.java:3095
-#: build/trans_presets.java:3101 build/trans_presets.java:3110
-#: build/trans_presets.java:3118 build/trans_presets.java:3124
-#: build/trans_presets.java:3130 build/trans_presets.java:3137
-#: build/trans_presets.java:3143 build/trans_presets.java:3150
-#: build/trans_presets.java:3156 build/trans_presets.java:3162
-#: build/trans_presets.java:3168 build/trans_presets.java:3174
-#: build/trans_presets.java:3187 build/trans_presets.java:3201
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:87 build/trans_presets.java:123
+#: build/trans_presets.java:163 build/trans_presets.java:200
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:274
+#: build/trans_presets.java:292 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:364
+#: build/trans_presets.java:413 build/trans_presets.java:433
+#: build/trans_presets.java:448 build/trans_presets.java:463
+#: build/trans_presets.java:486 build/trans_presets.java:515
+#: build/trans_presets.java:535 build/trans_presets.java:558
+#: build/trans_presets.java:580 build/trans_presets.java:599
+#: build/trans_presets.java:618 build/trans_presets.java:636
+#: build/trans_presets.java:645 build/trans_presets.java:703
+#: build/trans_presets.java:729 build/trans_presets.java:738
+#: build/trans_presets.java:798 build/trans_presets.java:949
+#: build/trans_presets.java:957 build/trans_presets.java:965
+#: build/trans_presets.java:973 build/trans_presets.java:981
+#: build/trans_presets.java:991 build/trans_presets.java:999
+#: build/trans_presets.java:1004 build/trans_presets.java:1011
+#: build/trans_presets.java:1018 build/trans_presets.java:1023
+#: build/trans_presets.java:1031 build/trans_presets.java:1040
+#: build/trans_presets.java:1046 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1069 build/trans_presets.java:1078
+#: build/trans_presets.java:1087 build/trans_presets.java:1094
+#: build/trans_presets.java:1102 build/trans_presets.java:1115
+#: build/trans_presets.java:1121 build/trans_presets.java:1130
+#: build/trans_presets.java:1136 build/trans_presets.java:1142
+#: build/trans_presets.java:1150 build/trans_presets.java:1247
+#: build/trans_presets.java:1298 build/trans_presets.java:1304
+#: build/trans_presets.java:1310 build/trans_presets.java:1316
+#: build/trans_presets.java:1322 build/trans_presets.java:1328
+#: build/trans_presets.java:1341 build/trans_presets.java:1366
+#: 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:1430 build/trans_presets.java:1440
+#: build/trans_presets.java:1450 build/trans_presets.java:1470
+#: build/trans_presets.java:1482 build/trans_presets.java:1493
+#: build/trans_presets.java:1513 build/trans_presets.java:1522
+#: build/trans_presets.java:1578 build/trans_presets.java:1595
+#: build/trans_presets.java:1602 build/trans_presets.java:1607
+#: build/trans_presets.java:1613 build/trans_presets.java:1619
+#: build/trans_presets.java:1624 build/trans_presets.java:1630
+#: build/trans_presets.java:1636 build/trans_presets.java:1644
+#: build/trans_presets.java:1652 build/trans_presets.java:1660
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1687
+#: build/trans_presets.java:1695 build/trans_presets.java:1702
+#: build/trans_presets.java:1710 build/trans_presets.java:1717
+#: build/trans_presets.java:1723 build/trans_presets.java:1730
+#: build/trans_presets.java:1737 build/trans_presets.java:1744
+#: build/trans_presets.java:1761 build/trans_presets.java:1769
+#: build/trans_presets.java:1784 build/trans_presets.java:1794
+#: build/trans_presets.java:1806 build/trans_presets.java:1813
+#: build/trans_presets.java:1819 build/trans_presets.java:1829
+#: build/trans_presets.java:1834 build/trans_presets.java:1842
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1877
+#: build/trans_presets.java:1882 build/trans_presets.java:1889
+#: build/trans_presets.java:1895 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1927 build/trans_presets.java:1936
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2050
+#: build/trans_presets.java:2059 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2177 build/trans_presets.java:2183
+#: build/trans_presets.java:2189 build/trans_presets.java:2196
+#: build/trans_presets.java:2203 build/trans_presets.java:2211
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2231 build/trans_presets.java:2237
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2257 build/trans_presets.java:2264
+#: build/trans_presets.java:2271 build/trans_presets.java:2278
+#: build/trans_presets.java:2286 build/trans_presets.java:2318
+#: build/trans_presets.java:2323 build/trans_presets.java:2333
+#: build/trans_presets.java:2338 build/trans_presets.java:2344
+#: build/trans_presets.java:2350 build/trans_presets.java:2367
+#: build/trans_presets.java:2373 build/trans_presets.java:2379
+#: build/trans_presets.java:2385 build/trans_presets.java:2391
+#: build/trans_presets.java:2402 build/trans_presets.java:2409
+#: build/trans_presets.java:2510 build/trans_presets.java:2517
+#: build/trans_presets.java:2538 build/trans_presets.java:2546
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2564 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2590 build/trans_presets.java:2597
+#: build/trans_presets.java:2604 build/trans_presets.java:2610
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2654 build/trans_presets.java:2661
+#: build/trans_presets.java:2668 build/trans_presets.java:2674
+#: build/trans_presets.java:2680 build/trans_presets.java:2686
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2705 build/trans_presets.java:2712
+#: build/trans_presets.java:2719 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2756
+#: build/trans_presets.java:2765 build/trans_presets.java:2780
+#: build/trans_presets.java:2786 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2821
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2877
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2904
+#: build/trans_presets.java:2911 build/trans_presets.java:2918
+#: build/trans_presets.java:2924 build/trans_presets.java:2931
+#: build/trans_presets.java:2938 build/trans_presets.java:2947
+#: build/trans_presets.java:2953 build/trans_presets.java:2959
+#: build/trans_presets.java:2965 build/trans_presets.java:2971
+#: build/trans_presets.java:2980 build/trans_presets.java:2990
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3091
+#: build/trans_presets.java:3098 build/trans_presets.java:3105
+#: build/trans_presets.java:3111 build/trans_presets.java:3120
+#: build/trans_presets.java:3128 build/trans_presets.java:3134
+#: build/trans_presets.java:3140 build/trans_presets.java:3147
+#: build/trans_presets.java:3153 build/trans_presets.java:3160
+#: build/trans_presets.java:3166 build/trans_presets.java:3172
+#: build/trans_presets.java:3178 build/trans_presets.java:3184
+#: build/trans_presets.java:3196 build/trans_presets.java:3210
+#: build/trans_presets.java:3229 build/trans_presets.java:3243
 msgid "Name"
 msgstr "名前"
@@ -7790,12 +7828,4 @@
 msgstr "メインの選択肢から条件を選んでください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select in relation list"
-msgstr "関連リストから選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
-msgid "Select relation in relation list."
-msgstr "リレーション一覧のリレーションを選択。"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 msgid "Edit the relation the currently selected relation member refers to."
@@ -7828,5 +7858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
 msgid "Conflict in data"
@@ -7904,5 +7934,5 @@
 msgstr "ロールを入力して選択されたリレーションメンバーに適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -7914,14 +7944,14 @@
 "参照をどうしますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
 msgid "Remove them, clean up relation"
 msgstr "削除し、リレーションをクリーンナップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Ignore them, leave relation as is"
 msgstr "無視し、リレーションはそのまま"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 #, java-format
 msgid ""
@@ -7934,9 +7964,9 @@
 "か？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
 msgid "Multiple members referring to same primitive"
 msgstr "複数のメンバーが同じプリミティブを参照しています"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
 #, java-format
 msgid ""
@@ -7948,5 +7978,5 @@
 "起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -7954,5 +7984,5 @@
 "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -7960,5 +7990,5 @@
 "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -7968,5 +7998,5 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -7976,20 +8006,20 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
 msgid "Relation Editor: Remove Selected"
 msgstr "リレーション編集画面: 削除が選択されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
 #, java-format
 msgid ""
@@ -7999,64 +8029,64 @@
 "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
 msgid "Select primitives for selected relation members"
 msgstr "選択されたリレーションメンバーのプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
 msgid "Sort the relation members"
 msgstr "リレーションメンバーをソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Sort"
 msgstr "並べ替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
 msgid "Relation Editor: Sort"
 msgstr "リレーション編集画面: ソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
 msgstr "リレーションメンバーの表示順序を反転する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
 msgstr "逆順"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
 msgstr "リレーションエディタ:反転"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
 msgid "Move the currently selected members up"
 msgstr "選択したメンバーを1つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
 msgid "Relation Editor: Move Up"
 msgstr "リレーション編集画面: 上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
 msgid "Relation Editor: Move Down"
 msgstr "リレーション編集画面: 下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Remove the currently selected members from this relation"
 msgstr "このリレーションから選択したメンバーを削除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 msgid "Relation Editor: Remove"
 msgstr "リレーション編集画面: 削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
 msgstr "現在編集されたリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -8068,23 +8098,23 @@
 "それらはリレーションメンバーリストから削除されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
 msgid "Yes, create a conflict and close"
 msgstr "はい、競合を作成して閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 msgid "Click to create a conflict and close this relation editor"
 msgstr "クリックして競合を作成し、このリレーションエディタを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
 msgid "No, continue editing"
 msgstr "いいえ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -8095,5 +8125,5 @@
 "集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 #, java-format
 msgid ""
@@ -8104,50 +8134,50 @@
 "最初にこの競合を解決してからやり直してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
 msgid "Apply the current updates"
 msgstr "現在の更新を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
 msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
 msgid "Cancel the updates and close the dialog"
 msgstr "更新をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
 msgid "Add an empty tag"
 msgstr "空のタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Download all incomplete members"
 msgstr "全ての不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
 msgid "Relation Editor: Download Members"
 msgstr "リレーション編集画面: メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
 msgid "Download selected incomplete members"
 msgstr "選択された不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Sets a role for the selected members"
 msgstr "選択されたメンバーにロールをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300
 msgid "Apply Role"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
 #, java-format
 msgid "You are setting an empty role on {0} primitive."
@@ -8155,25 +8185,25 @@
 msgstr[0] "{0} プリミティブに空のロールを設定しています。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
 msgid "This is equal to deleting the roles of these primitives."
 msgstr "これはこれらのプリミティブのロールを削除することと同じです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
 msgid "Do you really want to apply the new role?"
 msgstr "新しいロールを本当に適用しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Yes, apply it"
 msgstr "はい、適用します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
 msgid "No, do not apply"
 msgstr "いいえ、適用しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328
 msgid "Confirm empty role"
 msgstr "空のロールを確認"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "選択中のリレーションメンバーが参照しているリレーションを編集"
@@ -8516,10 +8546,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/trans_presets.java:402 build/trans_presets.java:660
-#: build/trans_presets.java:669 build/trans_presets.java:1032
-#: build/trans_presets.java:1358 build/trans_presets.java:2348
-#: build/trans_presets.java:2382 build/trans_presets.java:2391
-#: build/trans_presets.java:2417 build/trans_presets.java:2971
-#: build/trans_presets.java:2981 build/trans_presets.java:2990
+#: build/trans_presets.java:411 build/trans_presets.java:669
+#: build/trans_presets.java:678 build/trans_presets.java:1041
+#: build/trans_presets.java:1368 build/trans_presets.java:2358
+#: build/trans_presets.java:2392 build/trans_presets.java:2401
+#: build/trans_presets.java:2427 build/trans_presets.java:2981
+#: build/trans_presets.java:2991 build/trans_presets.java:3000
 msgid "Type"
 msgstr "タイプ"
@@ -8538,16 +8568,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:382 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:385
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466 build/trans_presets.java:490
-#: build/trans_presets.java:533 build/trans_presets.java:645
-#: build/trans_presets.java:660 build/trans_presets.java:1269
-#: build/trans_presets.java:1363 build/trans_presets.java:1364
-#: build/trans_presets.java:1365 build/trans_presets.java:2491
-#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:499
+#: build/trans_presets.java:542 build/trans_presets.java:654
+#: build/trans_presets.java:669 build/trans_presets.java:1278
+#: build/trans_presets.java:1373 build/trans_presets.java:1374
+#: build/trans_presets.java:1375 build/trans_presets.java:2501
+#: build/trans_presets.java:2502 build/trans_presets.java:2503
 msgid "unknown"
 msgstr "不明な"
@@ -9388,20 +9418,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:79 build/trans_presets.java:96
-#: build/trans_presets.java:115 build/trans_presets.java:134
-#: build/trans_presets.java:155 build/trans_presets.java:171
-#: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:236 build/trans_presets.java:254
-#: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:342
-#: build/trans_presets.java:361 build/trans_presets.java:410
-#: build/trans_presets.java:425 build/trans_presets.java:440
-#: build/trans_presets.java:463 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:579
-#: build/trans_presets.java:597 build/trans_presets.java:616
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:983 build/trans_presets.java:1244
+#: build/trans_presets.java:88 build/trans_presets.java:105
+#: build/trans_presets.java:124 build/trans_presets.java:143
+#: build/trans_presets.java:164 build/trans_presets.java:180
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:245 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:472 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:565 build/trans_presets.java:588
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:958 build/trans_presets.java:966
+#: build/trans_presets.java:974 build/trans_presets.java:982
+#: build/trans_presets.java:992 build/trans_presets.java:1253
 msgid "Layer"
 msgstr "レイヤー"
@@ -9573,4 +9603,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
+"<strong>{0} オブジェクト</strong> を<strong>1 変更セット</strong> へ<strong>"
+"{1} リクエスト</strong>を使用してアップロードしています"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9633,4 +9665,7 @@
 "on the server ''{1}''."
 msgstr ""
+"サーバから現在の変更セットが閉じられたという通知がありました。<br>おそらく変"
+"更セットのサイズがサーバ {1} 上の {0} オブジェクトの最大サイズを超えていま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9844,5 +9879,5 @@
 msgstr[0] "削除するオブジェクトの個数: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
@@ -9850,30 +9885,30 @@
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -9881,5 +9916,5 @@
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -9888,5 +9923,5 @@
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
@@ -9895,18 +9930,18 @@
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:221
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
 #, java-format
 msgid ""
@@ -9918,23 +9953,23 @@
 "タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
 msgid "Import not possible"
 msgstr "インポートできません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
 #, java-format
 msgid ""
@@ -9946,5 +9981,5 @@
 "タイムスタンプの情報が無いため、写真との同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9952,5 +9987,5 @@
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:416
 #, java-format
@@ -9958,5 +9993,5 @@
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
 #, java-format
 msgid "{0} track"
@@ -9965,23 +10000,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3246
 msgid "Description"
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:448
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:449
 #, java-format
 msgid "{0} route, "
@@ -9989,5 +10024,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:449
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:450
 #, java-format
 msgid "{0} waypoint"
@@ -9995,10 +10030,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10009,43 +10044,59 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:842
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:990
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:875
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:881
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:882
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:884
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:890
+msgid "Download near:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
+msgid "track only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
+msgid "waypoints only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
+msgid "track and waypoints"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1017
 #, java-format
 msgid ""
@@ -10056,9 +10107,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1091
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1126
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1286
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10068,5 +10119,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1293
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10151,5 +10202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
@@ -10611,9 +10662,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:242
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "\n"
 "Direction {0}°"
-msgstr "方向"
+msgstr ""
+"\n"
+"方向 {0}°"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
@@ -10953,4 +11006,7 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
+"<html>OSMサーバからOAuthアクセストークンを参照する自動処理が<br>失敗しまし"
+"た。<br><br>やり直すか、手の認証処理(例:半自動認証や手動認証)<br>を選択してく"
+"ださい。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -11393,5 +11449,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 msgid "Please select the row to edit."
 msgstr "編集する列を選択してください。"
@@ -11405,5 +11461,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11622,5 +11678,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1323
+#: build/trans_presets.java:1332
 msgid "Car"
 msgstr "自動車"
@@ -11642,13 +11698,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:378 build/trans_presets.java:488
-#: build/trans_presets.java:745 build/trans_presets.java:764
-#: build/trans_presets.java:778 build/trans_presets.java:800
-#: build/trans_presets.java:837 build/trans_presets.java:850
-#: build/trans_presets.java:862 build/trans_presets.java:874
-#: build/trans_presets.java:886 build/trans_presets.java:898
-#: build/trans_presets.java:908 build/trans_presets.java:917
-#: build/trans_presets.java:926 build/trans_presets.java:1396
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:387 build/trans_presets.java:497
+#: build/trans_presets.java:754 build/trans_presets.java:773
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:846 build/trans_presets.java:859
+#: build/trans_presets.java:871 build/trans_presets.java:883
+#: build/trans_presets.java:895 build/trans_presets.java:907
+#: build/trans_presets.java:917 build/trans_presets.java:926
+#: build/trans_presets.java:935 build/trans_presets.java:1406
+#: build/trans_presets.java:1472
 msgid "Bicycle"
 msgstr "自転車"
@@ -11682,12 +11738,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:379 build/trans_presets.java:487
-#: build/trans_presets.java:744 build/trans_presets.java:763
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:836 build/trans_presets.java:849
-#: build/trans_presets.java:861 build/trans_presets.java:873
-#: build/trans_presets.java:885 build/trans_presets.java:897
-#: build/trans_presets.java:907 build/trans_presets.java:916
-#: build/trans_presets.java:925
+#: build/trans_presets.java:388 build/trans_presets.java:496
+#: build/trans_presets.java:753 build/trans_presets.java:772
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:906
+#: build/trans_presets.java:916 build/trans_presets.java:925
+#: build/trans_presets.java:934
 msgid "Foot"
 msgstr "徒歩"
@@ -11963,6 +12019,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:833
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
 msgid "Update plugins"
 msgstr "プラグインを更新"
@@ -12743,5 +12799,5 @@
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:340
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342
 #, java-format
 msgid ""
@@ -12750,24 +12806,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "この地物の詳細情報"
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506
+#, java-format
+msgid "Unknown requisite: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+msgid "count"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
+msgid "elements"
+msgstr ""
+
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
+msgid "Preset role element without parent"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:748
+msgid "Preset sub element without parent"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12777,15 +12862,15 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:828
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:891
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12794,17 +12879,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:894
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:896
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:979
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -12841,4 +12926,6 @@
 "a bounding box)"
 msgstr ""
+"www.openstreetmap.org のURL(ここにダウンロードURLを貼り付けてbboxを指定できま"
+"す)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
@@ -14172,38 +14259,38 @@
 msgstr "プラグインの更新に失敗しました"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
 msgid "Warning: failed to download plugin information list"
 msgstr "警告: プラグイン情報リストのダウンロードに失敗"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:804
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:708
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "プラグイン \"{0}\"の削除をするにはクリック"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
 msgid "Keep plugin"
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "クリックしてプラグイン ''{0}'' を保持"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:788
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "警告: 期限切れプラグイン ''{0}'' の削除に失敗。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
 #, java-format
 msgid ""
@@ -14214,5 +14301,5 @@
 "をスキップします。JOSMは古いプラグインのバージョンをロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:794
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
 #, java-format
 msgid ""
@@ -14223,10 +14310,10 @@
 "ルに失敗。リネームに失敗。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:806
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "クリックしてプラグイン ''{0}'' を無効化"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:819
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid ""
@@ -14234,10 +14321,10 @@
 msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:822
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:825
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14246,9 +14333,9 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:827
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:899
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14258,14 +14345,14 @@
 "再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:941
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
 msgid "Plugin information"
 msgstr "プラグイン情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:946
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "説明がありません"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:978
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14295,16 +14382,16 @@
 msgstr "ローカルプラグイン情報を読み込みます.."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:81
 msgid "Processing plugin site cache files..."
 msgstr "プラグインのサイトキャッシュファイルを処理中..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:85
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:110
 #, java-format
 msgid "Processing file ''{0}''"
 msgstr "ファイル \"{0}\"の処理中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:89
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
@@ -14313,19 +14400,19 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:106
 msgid "Processing plugin files..."
 msgstr "プラグインファイルの処理中..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:72
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:73
 msgid "Download plugin list..."
 msgstr "プラグインリストをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:133
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:136
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "''{0}'' からプラグインリストをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:188
 #, java-format
 msgid ""
@@ -14336,16 +14423,16 @@
 "からのプラグインリストをキャッシュできません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:189
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:192
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "ローカルキャッシュ ''{0}'' にプラグインリストを書き込み中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:230
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:233
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "サイト ''{0}'' からのプラグインリストをパースしています"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:235
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:238
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:241
 #, java-format
 msgid ""
@@ -14356,5 +14443,5 @@
 "す。例外コード: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:265
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14864,5 +14951,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:481
+#: build/trans_presets.java:490
 msgid "Visibility"
 msgstr "表示"
@@ -14953,5 +15040,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2306
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15111,5 +15198,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
 msgid "Building address"
-msgstr ""
+msgstr "建物の住所"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
@@ -15119,5 +15206,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "Street Name:"
-msgstr ""
+msgstr "通りの名前"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
@@ -15135,5 +15222,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
-msgstr ""
+msgstr "世界の外側には建物を配置できません。"
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
@@ -15146,13 +15233,13 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
-msgstr ""
+msgstr "ビルのサイズをセット"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
 msgid "Use Address dialog"
-msgstr ""
+msgstr "住所ダイアログを使用"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Buildings width:"
-msgstr ""
+msgstr "ビルの幅:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
@@ -15163,5 +15250,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
-msgstr ""
+msgstr "建物の描画"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
@@ -15179,5 +15266,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
-msgstr ""
+msgstr "ビルをつかむ"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
@@ -15187,5 +15274,5 @@
 #. group "Man-Made"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2169
 msgid "Buildings"
 msgstr "建物"
@@ -15211,5 +15298,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:418
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426
 msgid "Select Feuille"
 msgstr "用紙選択"
@@ -15285,5 +15372,5 @@
 "又はキャンセルされました。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Choose from..."
 msgstr "選択..."
@@ -15291,5 +15378,5 @@
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:397
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406
 msgid "Select commune"
 msgstr "コミューンの選択"
@@ -15352,5 +15439,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "Select first WMS layer in list."
-msgstr ""
+msgstr "リスト中の最初のWMSレイヤを選択。"
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15406,5 +15493,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2348 build/trans_style.java:993
+#: build/trans_presets.java:2358 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15415,5 +15502,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "symbol"
-msgstr ""
+msgstr "シンボル"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
@@ -15606,5 +15693,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244
 msgid "Layers:"
-msgstr ""
+msgstr "レイヤ:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
@@ -15742,5 +15829,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:96
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -15766,9 +15853,9 @@
 msgstr "非地理参照画像を取得"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:76
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:79
 msgid "Georeferencing interrupted"
 msgstr "地理参照は割り込みされた"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:115
 msgid ""
 "This image contains georeference data.\n"
@@ -15778,5 +15865,5 @@
 "これらを使用しますか？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:179
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:186
 msgid ""
 "Click first corner for image cropping\n"
@@ -15786,14 +15873,14 @@
 "(二箇所必要)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:180
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:206
 msgid "Image cropping"
 msgstr "イメージ切り抜き"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:198
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:205
 msgid "Click second corner for image cropping"
 msgstr "切り抜くイメージの二番目の角をクリック"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:218
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:225
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -15803,14 +15890,14 @@
 "（2つのポイントが必要）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:219
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:238
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
 msgid "Image georeferencing"
 msgstr "地理参照画像"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:237
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:244
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "２番目の地理参照用ランベルトcrosspiece をクリック"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:275
 msgid ""
 "Do you want to cancel completely\n"
@@ -15820,25 +15907,25 @@
 "それとも単にやり直しますか "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:285
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:292
 msgid "Enter cadastre east,north position"
 msgstr "cadastre の東、北の位置を入力"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:287
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:294
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(警告: 矢印のある北を確認！)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:289
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:296
 msgid "East"
 msgstr "東経"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:290
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
 msgid "North"
 msgstr "北緯"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
 msgstr "マウスを使います"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:318
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -15878,5 +15965,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
 msgid "(optional)"
-msgstr ""
+msgstr "(オプション)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16105,23 +16192,23 @@
 msgstr "複製したウェイの作成"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
 msgid "Layer for editing GPX tracks"
 msgstr "GPSトラックを編集するためのレイヤーです。"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "匿名時間も含めたGPXレイヤーへのコンバート"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:49
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java:161
+msgid "EditGpx"
+msgstr "Gpx編集"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
 msgid "edit gpx tracks"
 msgstr "gpxトラックの編集"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:88
-msgid "EditGpx"
-msgstr "Gpx編集"
-
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
@@ -16129,5 +16216,5 @@
 msgstr "GPXレイヤーからパスをインポート"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
@@ -16137,5 +16224,5 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
@@ -17000,9 +17087,9 @@
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:139
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:153
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:114
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -17012,5 +17099,5 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:149
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -17110,13 +17197,13 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
 msgid "Calibration Files"
-msgstr ""
+msgstr "較正ファイル"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "画像較正をロード..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Loads calibration data to a file"
-msgstr ""
+msgstr "較正データをファイルにロードします"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
@@ -17127,5 +17214,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "PicLayer move"
-msgstr ""
+msgstr "PicLayer 移動"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
@@ -17135,5 +17222,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
 msgid "New picture layer from clipboard"
-msgstr ""
+msgstr "クリップボードからの新しい画像"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
@@ -17143,5 +17230,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
 msgid "New picture layer from file..."
-msgstr ""
+msgstr "ファイルからの新しい画像..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
@@ -17167,5 +17254,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
 msgid "Resets picture calibration"
-msgstr ""
+msgstr "画像較正をリセット"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
@@ -17191,5 +17278,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "PicLayer rotate"
-msgstr ""
+msgstr "PicLayer回転"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
@@ -17199,13 +17286,13 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "画像較正を保存..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Saves calibration data to a file"
-msgstr ""
+msgstr "較正データをファイルに保存"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
 msgid "JOSM PicLayer plugin calibration data"
-msgstr ""
+msgstr "JOSMPicLayerプラグイン較正データ"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
@@ -17216,29 +17303,29 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "PicLayer scale X"
-msgstr ""
+msgstr "PicLayer X軸"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "画像をドラッグしてX軸方向で調整"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "PicLayer scale"
-msgstr ""
+msgstr "PicLayer サイズ調整"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "画像をドラッグしてX及びY軸方向にサイズ調整"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "PicLayer scale Y"
-msgstr ""
+msgstr "PicLayer Y軸スケール"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "画像をドラッグしてY軸方向にサイズ調整"
 
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1422
 msgid "Public Transport"
 msgstr "公共交通機関"
@@ -17290,5 +17377,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:621
+#: build/trans_presets.java:630
 msgid "Waypoints"
 msgstr "ウェイポイント"
@@ -17351,20 +17438,20 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:235
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:248
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:236
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
 msgid "Remote Control has been asked to create a new node."
 msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -17376,5 +17463,5 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
 msgid "Objects history"
-msgstr ""
+msgstr "オブジェクト履歴"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
@@ -17393,14 +17480,14 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 msgid "Revert changeset"
-msgstr ""
+msgstr "変更セットを元に戻す"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 msgid "Reverting..."
-msgstr ""
+msgstr "元に戻しています..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
 #, java-format
 msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "変更セット # {0} を元に戻す"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17772,5 +17859,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:192
 msgid "Street name: "
-msgstr ""
+msgstr "ストリート名: "
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:275
@@ -18284,5 +18371,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355
 msgid "Select in current data layer"
-msgstr ""
+msgstr "現在のデータレイヤで選択"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
@@ -18352,5 +18439,5 @@
 msgctxt "keyboard-modifiers"
 msgid "Modifiers:"
-msgstr ""
+msgstr "修飾キー:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78
@@ -18627,9 +18714,9 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
 #, java-format
 msgid ""
@@ -18888,5 +18975,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3189
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -18988,4 +19075,62 @@
 msgstr "重なったウェイ"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44
+msgid "Relation checker :"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45
+msgid "This plugin checks for errors in relations."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115
+msgid "Relation type is unknown"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145
+msgid "Relation is empty"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155
+msgid "<empty>"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163
+#, java-format
+msgid "Role {0} missing"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201
+msgid "Role verification problem"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200
+msgid "Empty role found"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:34
@@ -19008,23 +19153,23 @@
 msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
 msgid "Properties checker :"
 msgstr "プロパティチェッカー："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:154
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:158
 msgid "This plugin checks for errors in property keys and values."
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:290
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:299
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:303
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:310
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:314
 #, java-format
 msgid ""
@@ -19035,7 +19180,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:446
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:451
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:452
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -19043,80 +19188,96 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:471
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+msgid "Tag value contains character with code less than 0x20"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:498
+msgid "Tag key contains character with code less than 0x20"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:504
+msgid "Tag value longer than allowed"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510
+msgid "Tag key longer than allowed"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:516
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:482
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:522
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:528
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:494
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:540
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:567
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:528
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:568
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:590
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:591
 msgid "Presets do not contain property value"
 msgstr "プリセットに含まれていない属性値です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:563
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:650
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
 msgid "Validate property values and tags using complex rules."
 msgstr "混合ルールを使用しているプロパティの値とタグを検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:680
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:681
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -19126,90 +19287,90 @@
 "index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Delete the selected source from the list."
 msgstr "リストから選択した情報源を削除"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:708
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:768
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
 msgid "Validate that property values are valid checking against presets."
 msgstr "プリセットをチェックしてプロパティの値が正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:776
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:777
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:784
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:785
 msgid "Check if map painting found data errors."
 msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:792
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:793
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:796
 msgid "Use default tag ignore file."
 msgstr "デフォルトタグを使用、ファイルを無視。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:797
 msgid "Use the default tag ignore file (recommended)."
 msgstr "デフォルトタグを使用、ファイルを無視（推奨）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:800
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:801
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:855
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:895
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:970
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1012
 msgid "Incorrect number of parameters"
 msgstr "パラメータの数が不正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1030
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1039
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1003
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1043
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -19370,5 +19531,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:107
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:125
 msgid "Shows current position in the video"
 msgstr ""
@@ -19822,4 +19983,190 @@
 msgid "forest"
 msgstr "森"
+
+#. Landuse type used in multipolygons
+#: build/specialmessages.java:14
+msgid "farmland"
+msgstr ""
+
+#. Landuse type used in multipolygons
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--boundary tags -->
+#.
+#. <rule>
+#. <condition k="boundary" v="national"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="administrative"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="civil"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="political"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="national_park"/>
+#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/trans_style.java:3630 build/trans_style.java:3634
+#: build/trans_style.java:3638 build/trans_style.java:3642
+#: build/trans_style.java:3646 build/trans_style.java:3650
+#: build/trans_style.java:3654 build/trans_style.java:3658
+#: build/trans_style.java:3662 build/trans_style.java:3666
+#: build/trans_style.java:3671 build/trans_style.java:3679
+#: build/trans_style.java:3687 build/trans_style.java:3695
+msgid "boundary"
+msgstr "行政区境"
+
+#. relation type
+#: build/specialmessages.java:16
+msgid "multipolygon"
+msgstr ""
+
+#. relation type
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="tree"/>
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--route tags -->
+#.
+#. <rule>
+#. <condition k="route" v="bus"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ferry"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="flight"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ncn"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="subsea"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ski"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="tour"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="pub_crawl"/>
+#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612
+msgid "route"
+msgstr "ルート"
 
 #. Plugin AddrInterpolation
@@ -20195,4 +20542,12 @@
 #. default: ticked on/off
 #. delete_if_empty: true/false
+#. value_on: the value to set when checked (default is "yes")
+#. value_off: the value to set when unchecked (default is 'no')
+#. role: type to specify possible roles in relations
+#. key: the role name used in relation
+#. text: fixed label to display
+#. requisite: "optional" or "required" (default is optional)
+#. count: how often can the role occur (if not given unlimited number is assumed)
+#. type: the data types - way,node,relation,closedway (separated by comma)
 #. For external files the <annotations> should have following elements:
 #. - author           the author of the preset
@@ -20212,10 +20567,10 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:68
+#: build/trans_presets.java:77
 msgid "Highways"
 msgstr "道路"
 
 #. group "Highways"
-#: build/trans_presets.java:69
+#: build/trans_presets.java:78
 msgid "Streets"
 msgstr "ストリート"
@@ -20226,5 +20581,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:70 build/trans_surveyor.java:72
+#: build/trans_presets.java:79 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "自動車専用道路"
@@ -20233,5 +20588,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:73
+#: build/trans_presets.java:82
 msgid "Edit Motorway"
 msgstr "自動車専用道路の編集"
@@ -20268,10 +20623,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:76 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:152
-#: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1524 build/trans_presets.java:1532
-#: build/trans_presets.java:1540 build/trans_presets.java:1574
-#: build/trans_presets.java:2401 build/trans_presets.java:3216
+#: build/trans_presets.java:85 build/trans_presets.java:121
+#: build/trans_presets.java:141 build/trans_presets.java:161
+#: build/trans_presets.java:198 build/trans_presets.java:218
+#: build/trans_presets.java:1534 build/trans_presets.java:1542
+#: build/trans_presets.java:1550 build/trans_presets.java:1584
+#: build/trans_presets.java:2411 build/trans_presets.java:3244
 msgid "Reference"
 msgstr "道路番号"
@@ -20285,8 +20640,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:80 build/trans_presets.java:97
-#: build/trans_presets.java:116 build/trans_presets.java:135
-#: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:411
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:420
 msgid "Lanes"
 msgstr "車線数"
@@ -20305,13 +20660,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:81 build/trans_presets.java:98
-#: build/trans_presets.java:117 build/trans_presets.java:136
-#: build/trans_presets.java:157 build/trans_presets.java:173
-#: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:344 build/trans_presets.java:364
-#: build/trans_presets.java:386 build/trans_presets.java:426
-#: build/trans_presets.java:441 build/trans_presets.java:495
-#: build/trans_presets.java:514 build/trans_presets.java:1246
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:321
+#: build/trans_presets.java:353 build/trans_presets.java:373
+#: build/trans_presets.java:395 build/trans_presets.java:435
+#: build/trans_presets.java:450 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:1255
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -20345,17 +20700,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:82 build/trans_presets.java:99
-#: build/trans_presets.java:118 build/trans_presets.java:137
-#: build/trans_presets.java:158 build/trans_presets.java:174
-#: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:337 build/trans_presets.java:356
-#: build/trans_presets.java:373 build/trans_presets.java:405
-#: build/trans_presets.java:462 build/trans_presets.java:486
-#: build/trans_presets.java:508 build/trans_presets.java:528
-#: build/trans_presets.java:551 build/trans_presets.java:573
-#: build/trans_presets.java:611 build/trans_presets.java:1239
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:239 build/trans_presets.java:258
+#: build/trans_presets.java:276 build/trans_presets.java:294
+#: build/trans_presets.java:313 build/trans_presets.java:334
+#: build/trans_presets.java:346 build/trans_presets.java:365
+#: build/trans_presets.java:382 build/trans_presets.java:414
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:620 build/trans_presets.java:1248
 msgid "Oneway"
 msgstr "一方通行"
@@ -20392,17 +20747,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:83 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:139
-#: build/trans_presets.java:160 build/trans_presets.java:176
-#: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:357 build/trans_presets.java:406
-#: build/trans_presets.java:415 build/trans_presets.java:458
-#: build/trans_presets.java:482 build/trans_presets.java:509
-#: build/trans_presets.java:529 build/trans_presets.java:552
-#: build/trans_presets.java:574 build/trans_presets.java:592
-#: build/trans_presets.java:612 build/trans_presets.java:1240
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:347
+#: build/trans_presets.java:366 build/trans_presets.java:415
+#: build/trans_presets.java:424 build/trans_presets.java:467
+#: build/trans_presets.java:491 build/trans_presets.java:518
+#: build/trans_presets.java:538 build/trans_presets.java:561
+#: build/trans_presets.java:583 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1249
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20436,17 +20791,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:84 build/trans_presets.java:101
-#: build/trans_presets.java:121 build/trans_presets.java:140
-#: build/trans_presets.java:161 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:358 build/trans_presets.java:407
-#: build/trans_presets.java:431 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:593
-#: build/trans_presets.java:613 build/trans_presets.java:1241
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:440 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1250
 msgid "Tunnel"
 msgstr "トンネル"
@@ -20477,17 +20832,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:85 build/trans_presets.java:102
-#: build/trans_presets.java:122 build/trans_presets.java:141
-#: build/trans_presets.java:162 build/trans_presets.java:178
-#: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:359 build/trans_presets.java:408
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:511 build/trans_presets.java:531
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:594 build/trans_presets.java:614
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:469 build/trans_presets.java:493
+#: build/trans_presets.java:520 build/trans_presets.java:540
+#: build/trans_presets.java:563 build/trans_presets.java:585
+#: build/trans_presets.java:603 build/trans_presets.java:623
+#: build/trans_presets.java:1251
 msgid "Cutting"
 msgstr "切り通し"
@@ -20518,17 +20873,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:86 build/trans_presets.java:103
-#: build/trans_presets.java:123 build/trans_presets.java:142
-#: build/trans_presets.java:163 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:360 build/trans_presets.java:409
-#: build/trans_presets.java:461 build/trans_presets.java:485
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1252
 msgid "Embankment"
 msgstr "土手"
@@ -20536,5 +20891,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:89
+#: build/trans_presets.java:98
 msgid "Motorway Link"
 msgstr "自動車専用道路の連絡路"
@@ -20543,5 +20898,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:92
+#: build/trans_presets.java:101
 msgid "Edit Motorway Link"
 msgstr "自動車専用道路の連絡路の編集"
@@ -20549,5 +20904,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:106
+#: build/trans_presets.java:115
 msgid "Trunk"
 msgstr "国道"
@@ -20556,5 +20911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:109
+#: build/trans_presets.java:118
 msgid "Edit Trunk"
 msgstr "国道の編集"
@@ -20564,6 +20919,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:119 build/trans_presets.java:138
-#: build/trans_presets.java:159 build/trans_presets.java:175
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
 msgid "Motorroad"
 msgstr "車道"
@@ -20571,5 +20926,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:126
+#: build/trans_presets.java:135
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -20578,5 +20933,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:129
+#: build/trans_presets.java:138
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -20589,5 +20944,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:146 build/trans_surveyor.java:76
+#: build/trans_presets.java:155 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "主要地方道"
@@ -20596,5 +20951,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:149
+#: build/trans_presets.java:158
 msgid "Edit Primary Road"
 msgstr "主要地方道を編集"
@@ -20602,10 +20957,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:166
+#: build/trans_presets.java:175
 msgid "Primary Link"
 msgstr "主要地方道の連絡路"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:167
+#: build/trans_presets.java:176
 msgid "Edit Primary Link"
 msgstr "主要地方道の連絡路の編集"
@@ -20617,5 +20972,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:182 build/trans_surveyor.java:80
+#: build/trans_presets.java:191 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "一般地方道"
@@ -20625,5 +20980,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:186
+#: build/trans_presets.java:195
 msgid "Edit Secondary Road"
 msgstr "一般地方道の編集"
@@ -20631,5 +20986,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:202
+#: build/trans_presets.java:211
 msgid "Tertiary"
 msgstr "一般道(2車線以上)"
@@ -20639,5 +20994,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:206
+#: build/trans_presets.java:215
 msgid "Edit Tertiary Road"
 msgstr "一般道(2車線以上)の編集"
@@ -20649,5 +21004,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:221 build/trans_surveyor.java:84
+#: build/trans_presets.java:230 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "一般道(2車線未満)"
@@ -20657,5 +21012,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:225
+#: build/trans_presets.java:234
 msgid "Edit Unclassified Road"
 msgstr "一般道(2車線未満)の編集"
@@ -20665,6 +21020,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:578 build/trans_presets.java:596
+#: build/trans_presets.java:244 build/trans_presets.java:318
+#: build/trans_presets.java:587 build/trans_presets.java:605
 msgid "Passing Places"
 msgstr "対向車待機所"
@@ -20687,15 +21042,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:345
-#: build/trans_presets.java:365 build/trans_presets.java:412
-#: build/trans_presets.java:428 build/trans_presets.java:442
-#: build/trans_presets.java:467 build/trans_presets.java:496
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:598 build/trans_presets.java:617
-#: build/trans_presets.java:1247 build/trans_presets.java:1450
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:301
+#: build/trans_presets.java:322 build/trans_presets.java:354
+#: build/trans_presets.java:374 build/trans_presets.java:421
+#: build/trans_presets.java:437 build/trans_presets.java:451
+#: build/trans_presets.java:476 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:1256 build/trans_presets.java:1460
+#: build/trans_presets.java:1505
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -20707,5 +21062,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:241 build/trans_surveyor.java:88
+#: build/trans_presets.java:250 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住区域内道路"
@@ -20714,5 +21069,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:244
+#: build/trans_presets.java:253
 msgid "Edit Residential Street"
 msgstr "居住区域内道路の編集"
@@ -20732,12 +21087,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "Surface"
 msgstr "表面"
@@ -20759,166 +21114,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "unpaved"
 msgstr "未舗装"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "asphalt"
 msgstr "アスファルト"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "concrete"
 msgstr "コンクリート"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245 build/trans_presets.java:2483
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254 build/trans_presets.java:2493
 msgid "metal"
 msgstr "金属"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245 build/trans_presets.java:2483
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254 build/trans_presets.java:2493
 msgid "wood"
 msgstr "森"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "paving_stones"
 msgstr "敷石"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "cobblestone"
 msgstr "敷石"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "pebblestone"
 msgstr "小石"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "compacted"
 msgstr "圧縮"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:479
-#: build/trans_presets.java:507 build/trans_presets.java:527
-#: build/trans_presets.java:550 build/trans_presets.java:572
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "sand"
 msgstr "砂地"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:343
-#: build/trans_presets.java:362 build/trans_presets.java:456
-#: build/trans_presets.java:479 build/trans_presets.java:507
-#: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:591
-#: build/trans_presets.java:610 build/trans_presets.java:1245
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "ground"
 msgstr "地表"
@@ -20926,5 +21281,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:259
+#: build/trans_presets.java:268
 msgid "Living Street"
 msgstr "私道"
@@ -20933,5 +21288,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:262
+#: build/trans_presets.java:271
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -20939,5 +21294,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:277
+#: build/trans_presets.java:286
 msgid "Pedestrian"
 msgstr "歩行者専用道路"
@@ -20946,5 +21301,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:280
+#: build/trans_presets.java:289
 msgid "Edit Pedestrian Street"
 msgstr "歩行者専用道路の編集"
@@ -20952,5 +21307,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:295
+#: build/trans_presets.java:304
 msgid "Service"
 msgstr "敷地内道路"
@@ -20959,5 +21314,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:298
+#: build/trans_presets.java:307
 msgid "Edit Serviceway"
 msgstr "敷地内道路の編集"
@@ -20967,18 +21322,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:302
+#: build/trans_presets.java:311
 msgid "Serviceway type"
 msgstr "敷地内道路のタイプ"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:302
+#: build/trans_presets.java:311
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:302
+#: build/trans_presets.java:311
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:302
+#: build/trans_presets.java:311
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -20986,5 +21341,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:316
+#: build/trans_presets.java:325
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -20994,10 +21349,10 @@
 #. 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:320
+#: build/trans_presets.java:329
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
 
 #. </optional>
-#: build/trans_presets.java:329
+#: build/trans_presets.java:338
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -21006,5 +21361,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:332
+#: build/trans_presets.java:341
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -21012,14 +21367,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:357
 msgid "Construction"
 msgstr "工事中"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:358
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:363
+#: build/trans_presets.java:372
 msgid "Junction"
 msgstr "ジャンクション"
@@ -21035,5 +21390,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:363 build/trans_style.java:898
+#: build/trans_presets.java:372 build/trans_style.java:898
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -21042,5 +21397,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:369
+#: build/trans_presets.java:378
 msgid "Road Restrictions"
 msgstr "通行制限"
@@ -21049,15 +21404,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:372
+#: build/trans_presets.java:381
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:374
+#: build/trans_presets.java:383
 msgid "Toll"
 msgstr "料金"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:375
+#: build/trans_presets.java:384
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -21065,5 +21420,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:376 build/trans_presets.java:464
+#: build/trans_presets.java:385 build/trans_presets.java:473
 msgid "Access"
 msgstr "アクセス"
@@ -21105,27 +21460,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:382 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:385
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:533 build/trans_presets.java:669
-#: build/trans_presets.java:1155 build/trans_presets.java:1167
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227 build/trans_presets.java:1359
-#: build/trans_presets.java:1360 build/trans_presets.java:1363
-#: build/trans_presets.java:1364 build/trans_presets.java:1365
-#: build/trans_presets.java:1484 build/trans_presets.java:1485
-#: build/trans_presets.java:1486 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2440
-#: build/trans_presets.java:2441 build/trans_presets.java:2482
-#: build/trans_presets.java:2491 build/trans_presets.java:2492
-#: build/trans_presets.java:2493 build/trans_presets.java:2783
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:542 build/trans_presets.java:678
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1373
+#: build/trans_presets.java:1374 build/trans_presets.java:1375
+#: build/trans_presets.java:1494 build/trans_presets.java:1495
+#: build/trans_presets.java:1496 build/trans_presets.java:1788
+#: build/trans_presets.java:1798 build/trans_presets.java:2450
+#: build/trans_presets.java:2451 build/trans_presets.java:2492
+#: build/trans_presets.java:2501 build/trans_presets.java:2502
+#: build/trans_presets.java:2503 build/trans_presets.java:2793
 msgid "yes"
 msgstr "はい"
@@ -21138,10 +21493,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:376 build/trans_presets.java:378
-#: build/trans_presets.java:379 build/trans_presets.java:380
-#: build/trans_presets.java:381 build/trans_presets.java:382
-#: build/trans_presets.java:383 build/trans_presets.java:384
-#: build/trans_presets.java:385 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
 #: build/trans_style.java:212
 msgid "private"
@@ -21155,10 +21510,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:383 build/trans_presets.java:384
-#: build/trans_presets.java:385 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
 #: build/trans_style.java:219
 msgid "destination"
@@ -21182,97 +21537,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:382 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:385
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466 build/trans_style.java:205
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:376 build/trans_presets.java:380
-#: build/trans_presets.java:381 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:385 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:376 build/trans_presets.java:380
-#: build/trans_presets.java:381 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:385 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:383 build/trans_presets.java:384
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:376 build/trans_presets.java:377
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:382 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:385
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466 build/trans_presets.java:481
-#: build/trans_presets.java:487 build/trans_presets.java:488
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:533
-#: build/trans_presets.java:645 build/trans_presets.java:660
-#: build/trans_presets.java:1155 build/trans_presets.java:1167
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227 build/trans_presets.java:1269
-#: build/trans_presets.java:1359 build/trans_presets.java:1360
-#: build/trans_presets.java:1363 build/trans_presets.java:1364
-#: build/trans_presets.java:1365 build/trans_presets.java:1484
-#: build/trans_presets.java:1485 build/trans_presets.java:1486
-#: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-#: build/trans_presets.java:2482 build/trans_presets.java:2491
-#: build/trans_presets.java:2492 build/trans_presets.java:2493
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:490
+#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:542
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1278
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1373 build/trans_presets.java:1374
+#: build/trans_presets.java:1375 build/trans_presets.java:1494
+#: build/trans_presets.java:1495 build/trans_presets.java:1496
+#: build/trans_presets.java:1788 build/trans_presets.java:1798
+#: build/trans_presets.java:2450 build/trans_presets.java:2451
+#: build/trans_presets.java:2492 build/trans_presets.java:2501
+#: build/trans_presets.java:2502 build/trans_presets.java:2503
+#: build/trans_presets.java:2793
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:377
+#: build/trans_presets.java:386
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:377 build/trans_presets.java:378
-#: build/trans_presets.java:379 build/trans_presets.java:380
-#: build/trans_presets.java:381 build/trans_presets.java:382
-#: build/trans_presets.java:383 build/trans_presets.java:384
-#: build/trans_presets.java:385 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:487 build/trans_presets.java:488
-#: build/trans_presets.java:489 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:493
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
 msgid "designated"
 msgstr "指定済み"
 
-#: build/trans_presets.java:378 build/trans_presets.java:379
-#: build/trans_presets.java:380 build/trans_presets.java:381
-#: build/trans_presets.java:382 build/trans_presets.java:383
-#: build/trans_presets.java:384 build/trans_presets.java:385
-#: build/trans_presets.java:464 build/trans_presets.java:465
-#: build/trans_presets.java:466 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:380
+#: build/trans_presets.java:389
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:381
+#: build/trans_presets.java:390
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -21287,10 +21642,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:382 build/trans_presets.java:489
-#: build/trans_presets.java:746 build/trans_presets.java:779
-#: build/trans_presets.java:801 build/trans_presets.java:838
-#: build/trans_presets.java:851 build/trans_presets.java:863
-#: build/trans_presets.java:875 build/trans_presets.java:887
-#: build/trans_presets.java:927
+#: build/trans_presets.java:391 build/trans_presets.java:498
+#: build/trans_presets.java:755 build/trans_presets.java:788
+#: build/trans_presets.java:810 build/trans_presets.java:847
+#: build/trans_presets.java:860 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:936
 msgid "Horse"
 msgstr "馬"
@@ -21306,10 +21661,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:383 build/trans_presets.java:465
-#: build/trans_presets.java:747 build/trans_presets.java:765
-#: build/trans_presets.java:780 build/trans_presets.java:802
-#: build/trans_presets.java:839 build/trans_presets.java:852
-#: build/trans_presets.java:864 build/trans_presets.java:876
-#: build/trans_presets.java:888 build/trans_presets.java:928
+#: build/trans_presets.java:392 build/trans_presets.java:474
+#: build/trans_presets.java:756 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:811
+#: build/trans_presets.java:848 build/trans_presets.java:861
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:937
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -21324,19 +21679,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:384 build/trans_presets.java:466
-#: build/trans_presets.java:493 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:803
-#: build/trans_presets.java:840 build/trans_presets.java:853
-#: build/trans_presets.java:865 build/trans_presets.java:877
-#: build/trans_presets.java:889 build/trans_presets.java:929
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:502 build/trans_presets.java:775
+#: build/trans_presets.java:790 build/trans_presets.java:812
+#: build/trans_presets.java:849 build/trans_presets.java:862
+#: build/trans_presets.java:874 build/trans_presets.java:886
+#: build/trans_presets.java:898 build/trans_presets.java:938
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:385
+#: build/trans_presets.java:394
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:387
+#: build/trans_presets.java:396
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -21344,20 +21699,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:388 build/trans_presets.java:427
+#: build/trans_presets.java:397 build/trans_presets.java:436
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:389
+#: build/trans_presets.java:398
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:390
+#: build/trans_presets.java:399
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:400
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
@@ -21365,5 +21720,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:394
+#: build/trans_presets.java:403
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -21374,5 +21729,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:399
+#: build/trans_presets.java:408
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -21392,10 +21747,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:402 build/trans_style.java:553
+#: build/trans_presets.java:411 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "motorway_link"
 msgstr "自動車専用道路の連結路"
@@ -21417,10 +21772,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:402 build/trans_style.java:569
+#: build/trans_presets.java:411 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -21442,10 +21797,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:402 build/trans_style.java:585
+#: build/trans_presets.java:411 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "primary_link"
 msgstr "主要地方道の連絡路"
@@ -21467,5 +21822,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:402 build/trans_style.java:601
+#: build/trans_presets.java:411 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21480,9 +21835,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:402 build/trans_style.java:617
+#: build/trans_presets.java:411 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "unclassified"
 msgstr "一般道(2車線未満)"
@@ -21496,9 +21851,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:402 build/trans_style.java:3252
+#: build/trans_presets.java:411 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住区域内道路"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "living_street"
 msgstr "私道"
@@ -21528,10 +21883,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:402 build/trans_style.java:673
+#: build/trans_presets.java:411 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:402
+#: build/trans_presets.java:411
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -21561,5 +21916,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:402 build/trans_style.java:880
+#: build/trans_presets.java:411 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21571,10 +21926,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:420
+#: build/trans_presets.java:429
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:432
+#: build/trans_presets.java:441
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -21582,10 +21937,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:455
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:447
+#: build/trans_presets.java:456
 msgid "Track"
 msgstr "トラック"
@@ -21594,35 +21949,35 @@
 #. <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:450
+#: build/trans_presets.java:459
 msgid "Edit Track"
 msgstr "トラックの編集"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "Tracktype"
 msgstr "トラック種別"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:455
+#: build/trans_presets.java:464
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:457 build/trans_presets.java:480
+#: build/trans_presets.java:466 build/trans_presets.java:489
 msgid "MTB Scale"
 msgstr ""
@@ -21630,5 +21985,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:479
 msgid "Path"
 msgstr "小道"
@@ -21637,68 +21992,68 @@
 #. <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:473
+#: build/trans_presets.java:482
 msgid "Edit Path"
 msgstr "小道の編集"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:478 build/trans_presets.java:3214
+#: build/trans_presets.java:487 build/trans_presets.java:3242
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:478
+#: build/trans_presets.java:487
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:481
+#: build/trans_presets.java:490
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:481
+#: build/trans_presets.java:490
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:481 build/trans_presets.java:2042
+#: build/trans_presets.java:490 build/trans_presets.java:2052
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:481
+#: build/trans_presets.java:490
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:481
+#: build/trans_presets.java:490
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:499
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:491
+#: build/trans_presets.java:500
 msgid "Ski"
 msgstr "スキー"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:501
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -21707,5 +22062,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:500
+#: build/trans_presets.java:509
 msgid "Dedicated Bridleway"
 msgstr "馬車専用道"
@@ -21713,5 +22068,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:502
+#: build/trans_presets.java:511
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -21719,5 +22074,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:518
+#: build/trans_presets.java:527
 msgid "Dedicated Cycleway"
 msgstr "自転車専用道"
@@ -21735,11 +22090,11 @@
 #. 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:522 build/trans_presets.java:542
-#: build/trans_presets.java:564
+#: build/trans_presets.java:531 build/trans_presets.java:551
+#: build/trans_presets.java:573
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:533
+#: build/trans_presets.java:542
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
@@ -21747,5 +22102,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:538
+#: build/trans_presets.java:547
 msgid "Segregated Foot- and Cycleway"
 msgstr "分割された歩行者および自転車道"
@@ -21753,5 +22108,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:560
+#: build/trans_presets.java:569
 msgid "Combined Foot- and Cycleway"
 msgstr "統合された歩行者および自転車道"
@@ -21759,5 +22114,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:583
+#: build/trans_presets.java:592
 msgid "Dedicated Footway"
 msgstr "遊歩道"
@@ -21766,5 +22121,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:586
+#: build/trans_presets.java:595
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
@@ -21772,5 +22127,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:610
 msgid "Steps"
 msgstr "階段"
@@ -21780,10 +22135,10 @@
 #. 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:605
+#: build/trans_presets.java:614
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
 
 #. group "Waypoints"
-#: build/trans_presets.java:622
+#: build/trans_presets.java:631
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -21791,15 +22146,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:624
+#: build/trans_presets.java:633
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:628
+#: build/trans_presets.java:637
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:630
+#: build/trans_presets.java:639
 msgid "Services"
 msgstr "敷地内道路"
@@ -21807,5 +22162,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:632
+#: build/trans_presets.java:641
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -21845,17 +22200,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:637 build/trans_presets.java:790
-#: build/trans_presets.java:1330 build/trans_presets.java:1372
-#: build/trans_presets.java:1378 build/trans_presets.java:1386
-#: build/trans_presets.java:1393 build/trans_presets.java:1776
-#: build/trans_presets.java:1786 build/trans_presets.java:2215
-#: build/trans_presets.java:2317 build/trans_presets.java:2347
-#: build/trans_presets.java:2400 build/trans_presets.java:2408
-#: build/trans_presets.java:2425 build/trans_presets.java:2438
-#: build/trans_presets.java:2447 build/trans_presets.java:2454
-#: build/trans_presets.java:2519 build/trans_presets.java:2529
-#: build/trans_presets.java:2730 build/trans_presets.java:2747
-#: build/trans_presets.java:2762 build/trans_presets.java:2801
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:646 build/trans_presets.java:799
+#: build/trans_presets.java:1339 build/trans_presets.java:1382
+#: build/trans_presets.java:1388 build/trans_presets.java:1396
+#: build/trans_presets.java:1403 build/trans_presets.java:1786
+#: build/trans_presets.java:1796 build/trans_presets.java:2225
+#: build/trans_presets.java:2327 build/trans_presets.java:2357
+#: build/trans_presets.java:2410 build/trans_presets.java:2418
+#: build/trans_presets.java:2435 build/trans_presets.java:2448
+#: build/trans_presets.java:2457 build/trans_presets.java:2464
+#: build/trans_presets.java:2529 build/trans_presets.java:2539
+#: build/trans_presets.java:2740 build/trans_presets.java:2757
+#: build/trans_presets.java:2772 build/trans_presets.java:2811
+#: build/trans_presets.java:3249
 msgid "Operator"
 msgstr "操作員"
@@ -21864,5 +22219,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:650
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -21872,5 +22227,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:645
+#: build/trans_presets.java:654
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -21879,27 +22234,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:645 build/trans_presets.java:660
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:645 build/trans_presets.java:660
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:645 build/trans_presets.java:660
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:645 build/trans_presets.java:660
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:646 build/trans_presets.java:662
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:655 build/trans_presets.java:671
+#: build/trans_presets.java:1279
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -21907,6 +22262,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:647 build/trans_presets.java:661
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:656 build/trans_presets.java:670
+#: build/trans_presets.java:1280
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -21915,11 +22270,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:648 build/trans_presets.java:663
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:657 build/trans_presets.java:672
+#: build/trans_presets.java:1281
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:649
+#: build/trans_presets.java:658
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -21927,30 +22282,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:661
 msgid "Stop"
 msgstr "停止"
@@ -21958,5 +22313,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:655
+#: build/trans_presets.java:664
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -21965,14 +22320,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:658
+#: build/trans_presets.java:667
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:664
+#: build/trans_presets.java:673
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:666
+#: build/trans_presets.java:675
 msgid "Traffic Calming"
 msgstr "交通静穏化"
@@ -21980,33 +22335,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:668
+#: build/trans_presets.java:677
 msgid "Edit Traffic Calming"
 msgstr "交通静穏化を編集"
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:669
+#: build/trans_presets.java:678
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:671
+#: build/trans_presets.java:680
 msgid "Passing Place"
 msgstr "対向車待機所"
@@ -22014,5 +22369,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:673
+#: build/trans_presets.java:682
 msgid "Edit Passing Place"
 msgstr "対向車待機所を編集"
@@ -22020,5 +22375,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:676
+#: build/trans_presets.java:685
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -22029,14 +22384,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:681
+#: build/trans_presets.java:690
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:681
+#: build/trans_presets.java:690
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:683
+#: build/trans_presets.java:692
 msgid "Turning Circle"
 msgstr "転回場"
@@ -22046,5 +22401,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:697
 msgid "City Limit"
 msgstr "市境界標識"
@@ -22052,15 +22407,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:699
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:704
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:697
+#: build/trans_presets.java:706
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -22069,5 +22424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:701
+#: build/trans_presets.java:710
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -22075,5 +22430,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:704
+#: build/trans_presets.java:713
 msgid "Incline"
 msgstr "坂"
@@ -22081,5 +22436,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:707
+#: build/trans_presets.java:716
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -22087,5 +22442,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:719
 msgid "Grit Bin"
 msgstr "凍結防止用のグリット入れ"
@@ -22095,10 +22450,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:724
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:716
+#: build/trans_presets.java:725
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -22106,5 +22461,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:723
+#: build/trans_presets.java:732
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -22112,5 +22467,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:725
+#: build/trans_presets.java:734
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -22122,7 +22477,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:730 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2915
-#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:739 build/trans_presets.java:1625
+#: build/trans_presets.java:1770 build/trans_presets.java:2925
+#: build/trans_presets.java:2932 build/trans_presets.java:2939
 msgid "Elevation"
 msgstr "高度"
@@ -22130,5 +22485,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:734
+#: build/trans_presets.java:743
 msgid "Barriers"
 msgstr "ゲート等"
@@ -22136,5 +22491,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:737
+#: build/trans_presets.java:746
 msgid "Bollard"
 msgstr "車止め杭"
@@ -22142,5 +22497,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:748
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -22185,16 +22540,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:742 build/trans_presets.java:761
-#: build/trans_presets.java:775 build/trans_presets.java:797
-#: build/trans_presets.java:834 build/trans_presets.java:847
-#: build/trans_presets.java:859 build/trans_presets.java:871
-#: build/trans_presets.java:883 build/trans_presets.java:895
-#: build/trans_presets.java:905 build/trans_presets.java:914
-#: build/trans_presets.java:923
+#: build/trans_presets.java:751 build/trans_presets.java:770
+#: build/trans_presets.java:784 build/trans_presets.java:806
+#: build/trans_presets.java:843 build/trans_presets.java:856
+#: build/trans_presets.java:868 build/trans_presets.java:880
+#: build/trans_presets.java:892 build/trans_presets.java:904
+#: build/trans_presets.java:914 build/trans_presets.java:923
+#: build/trans_presets.java:932
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:758
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -22203,5 +22558,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:762
 msgid "Block"
 msgstr "ブロック"
@@ -22210,5 +22565,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:765
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -22216,5 +22571,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:758
+#: build/trans_presets.java:767
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -22222,5 +22577,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:777
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -22228,15 +22583,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:771
+#: build/trans_presets.java:780
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:781
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:783
+#: build/trans_presets.java:792
 msgid "Toll Booth"
 msgstr "料金所"
@@ -22244,5 +22599,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:785
+#: build/trans_presets.java:794
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -22250,10 +22605,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:793
+#: build/trans_presets.java:802
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:803
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -22263,5 +22618,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:808
+#: build/trans_presets.java:817
 msgid "Hedge"
 msgstr "生け垣"
@@ -22272,22 +22627,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:812 build/trans_presets.java:814
+#: build/trans_presets.java:821 build/trans_presets.java:823
 msgid "Fence"
 msgstr "フェンス"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:823
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:814
+#: build/trans_presets.java:823
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:814
+#: build/trans_presets.java:823
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:816
+#: build/trans_presets.java:825
 msgid "Wall"
 msgstr "壁"
@@ -22295,5 +22650,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:819
+#: build/trans_presets.java:828
 msgid "City Wall"
 msgstr "城壁"
@@ -22302,5 +22657,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:832
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -22312,10 +22667,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:830
+#: build/trans_presets.java:839
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:831
+#: build/trans_presets.java:840
 msgid "Edit Entrance"
 msgstr "入り口の編集"
@@ -22323,5 +22678,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1570
+#: build/trans_presets.java:851 build/trans_presets.java:1580
 msgid "Gate"
 msgstr "ゲート"
@@ -22329,50 +22684,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:853
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:855
+#: build/trans_presets.java:864
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:856
+#: build/trans_presets.java:865
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:867
+#: build/trans_presets.java:876
 msgid "Hampshire Gate"
 msgstr "ワイヤゲート"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:868
+#: build/trans_presets.java:877
 msgid "Edit Hampshire Gate"
 msgstr "ワイヤゲートの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:879
+#: build/trans_presets.java:888
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:889
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:891
+#: build/trans_presets.java:900
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:901
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:909
 msgid "Stile"
 msgstr "踏み越し段"
@@ -22380,25 +22735,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:902
+#: build/trans_presets.java:911
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:910
+#: build/trans_presets.java:919
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:911
+#: build/trans_presets.java:920
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:929
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -22409,11 +22764,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:934 build/trans_presets.java:935
-#: build/trans_presets.java:986
+#: build/trans_presets.java:943 build/trans_presets.java:944
+#: build/trans_presets.java:995
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water/Water"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Spring"
 msgstr "泉"
@@ -22421,5 +22776,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -22427,5 +22782,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943
+#: build/trans_presets.java:952
 msgid "Drain"
 msgstr "側溝"
@@ -22433,10 +22788,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:954
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:951
+#: build/trans_presets.java:960
 msgid "Ditch"
 msgstr ""
@@ -22444,10 +22799,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:953
+#: build/trans_presets.java:962
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:959
+#: build/trans_presets.java:968
 msgid "Stream"
 msgstr "小川"
@@ -22455,10 +22810,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:961
+#: build/trans_presets.java:970
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:976
 msgid "Canal"
 msgstr "運河"
@@ -22466,10 +22821,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:969
+#: build/trans_presets.java:978
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:975
+#: build/trans_presets.java:984
 msgid "River"
 msgstr "川"
@@ -22479,5 +22834,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:979
+#: build/trans_presets.java:988
 msgid "Edit River"
 msgstr "河川の編集"
@@ -22485,15 +22840,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:997
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:1001
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:993
+#: build/trans_presets.java:1002
 msgid "Edit Land"
 msgstr "陸地の編集"
@@ -22501,5 +22856,5 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1007
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -22507,10 +22862,10 @@
 # 水たまりになるような土地
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1008
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1013
 msgid "Reservoir"
 msgstr "ため池"
@@ -22518,15 +22873,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:1015
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1020
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1021
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -22534,5 +22889,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1017
+#: build/trans_presets.java:1026
 msgid "Riverbank"
 msgstr "川岸"
@@ -22541,10 +22896,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:1020
+#: build/trans_presets.java:1029
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1033
 msgid "Wetland"
 msgstr "湿地帯"
@@ -22555,14 +22910,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:1029
+#: build/trans_presets.java:1038
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "bog"
 msgstr "湿地"
@@ -22576,35 +22931,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1032 build/trans_style.java:3484
+#: build/trans_presets.java:1041 build/trans_style.java:3484
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1041
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1043
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1044
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1048
 msgid "Beach"
 msgstr "砂浜"
@@ -22612,20 +22967,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1050
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1045
+#: build/trans_presets.java:1054
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1055
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1059
 msgid "Cliff"
 msgstr "崖"
@@ -22633,10 +22988,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1061
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1065
 msgid "Coastline"
 msgstr "海岸線"
@@ -22644,5 +22999,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1067
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -22650,5 +23005,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1072
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -22656,5 +23011,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1074
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -22663,5 +23018,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1082
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
@@ -22669,10 +23024,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1084
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1089
 msgid "Dock"
 msgstr "ドック"
@@ -22680,5 +23035,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1091
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -22686,5 +23041,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1097
 msgid "Dam"
 msgstr "ダム"
@@ -22692,15 +23047,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1090
+#: build/trans_presets.java:1099
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1105
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1106
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -22709,5 +23064,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1110
 msgid "Weir"
 msgstr "堰"
@@ -22715,20 +23070,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1112
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1117
 msgid "Waterfall"
 msgstr "滝"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1118
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1123
 msgid "Turning Point"
 msgstr "転回地点"
@@ -22737,15 +23092,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1127
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1128
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1132
 msgid "Pier"
 msgstr "桟橋"
@@ -22753,10 +23108,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1134
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1138
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -22764,10 +23119,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1140
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -22777,20 +23132,20 @@
 #. 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:1139
+#: build/trans_presets.java:1148
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1154
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1155
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1156
 msgid "Rail"
 msgstr "線路"
@@ -22798,5 +23153,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1158
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -22826,7 +23181,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1153 build/trans_presets.java:1165
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1198 build/trans_presets.java:1210
+#: build/trans_presets.java:1222 build/trans_presets.java:1234
 msgid "Gauge (mm)"
 msgstr ""
@@ -22842,8 +23197,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1154 build/trans_presets.java:1166
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235
 msgid "Types"
 msgstr ""
@@ -22857,29 +23212,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1154 build/trans_presets.java:1166
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1255
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1154 build/trans_presets.java:1166
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1255
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1154 build/trans_presets.java:1166
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1255
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1155 build/trans_presets.java:1167
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236
 msgid "Electrified"
 msgstr ""
@@ -22892,8 +23247,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1155 build/trans_presets.java:1167
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236
 msgid "contact_line"
 msgstr ""
@@ -22964,8 +23319,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1155 build/trans_presets.java:1167
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227 build/trans_style.java:756
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22977,8 +23332,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1156 build/trans_presets.java:1168
-#: build/trans_presets.java:1180 build/trans_presets.java:1192
-#: build/trans_presets.java:1204 build/trans_presets.java:1216
-#: build/trans_presets.java:1228 build/trans_presets.java:2428
+#: build/trans_presets.java:1165 build/trans_presets.java:1177
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
+#: build/trans_presets.java:1237 build/trans_presets.java:2438
 msgid "Voltage"
 msgstr "電圧"
@@ -22991,8 +23346,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1157 build/trans_presets.java:1169
-#: build/trans_presets.java:1181 build/trans_presets.java:1193
-#: build/trans_presets.java:1205 build/trans_presets.java:1217
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1166 build/trans_presets.java:1178
+#: build/trans_presets.java:1190 build/trans_presets.java:1202
+#: build/trans_presets.java:1214 build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "Frequency (Hz)"
 msgstr "周波数 (Hz)"
@@ -23005,23 +23360,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1157 build/trans_presets.java:1169
-#: build/trans_presets.java:1181 build/trans_presets.java:1193
-#: build/trans_presets.java:1205 build/trans_presets.java:1217
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1166 build/trans_presets.java:1178
+#: build/trans_presets.java:1190 build/trans_presets.java:1202
+#: build/trans_presets.java:1214 build/trans_presets.java:1226
+#: build/trans_presets.java:1238
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1169
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1170
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1181
 msgid "Monorail"
 msgstr "モノレール"
@@ -23029,50 +23384,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1183
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
 #. </optional>
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1193
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1194
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
 #. </optional>
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1205
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1206
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1217
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1218
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
 #. </optional>
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1229
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1230
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1241
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -23080,5 +23435,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1243
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -23087,10 +23442,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1260
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:1261
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
@@ -23099,9 +23454,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1264
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1266
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -23110,5 +23465,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1270
 msgid "Level Crossing"
 msgstr "踏切"
@@ -23117,5 +23472,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1274
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -23125,5 +23480,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1278
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -23131,5 +23486,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1284
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -23138,5 +23493,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1288
 msgid "Buffer Stop"
 msgstr ""
@@ -23145,10 +23500,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1293
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1285
+#: build/trans_presets.java:1294
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -23156,10 +23511,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1296
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1300
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -23167,10 +23522,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1302
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1306
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -23178,10 +23533,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1308
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1312
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -23189,10 +23544,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:1314
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:1318
 msgctxt "aerialway"
 msgid "Station"
@@ -23201,5 +23556,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1320
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23207,5 +23562,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:1324
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23214,5 +23569,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1326
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23220,5 +23575,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1333
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -23228,62 +23583,62 @@
 #. 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:1328
+#: build/trans_presets.java:1337
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Esso"
 msgstr "エッソ"
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1339
 msgid "Indipend."
 msgstr ""
@@ -23341,32 +23696,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1333 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1693
-#: build/trans_presets.java:1701 build/trans_presets.java:1714
-#: build/trans_presets.java:1728 build/trans_presets.java:1825
-#: build/trans_presets.java:1833 build/trans_presets.java:1936
-#: build/trans_presets.java:1942 build/trans_presets.java:2255
-#: build/trans_presets.java:2279 build/trans_presets.java:2520
-#: build/trans_presets.java:2542 build/trans_presets.java:2548
-#: build/trans_presets.java:2555 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: 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:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2671 build/trans_presets.java:2677
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2696 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2748
-#: build/trans_presets.java:2756 build/trans_presets.java:2771
-#: build/trans_presets.java:2777 build/trans_presets.java:2785
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1654 build/trans_presets.java:1661
+#: build/trans_presets.java:1668 build/trans_presets.java:1674
+#: build/trans_presets.java:1681 build/trans_presets.java:1688
+#: build/trans_presets.java:1696 build/trans_presets.java:1703
+#: build/trans_presets.java:1711 build/trans_presets.java:1724
+#: build/trans_presets.java:1738 build/trans_presets.java:1835
+#: build/trans_presets.java:1843 build/trans_presets.java:1946
+#: build/trans_presets.java:1952 build/trans_presets.java:2265
+#: build/trans_presets.java:2289 build/trans_presets.java:2530
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2630 build/trans_presets.java:2636
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2662
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2681 build/trans_presets.java:2687
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2706 build/trans_presets.java:2713
+#: build/trans_presets.java:2720 build/trans_presets.java:2726
+#: build/trans_presets.java:2732 build/trans_presets.java:2758
+#: build/trans_presets.java:2766 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2795
+#: build/trans_presets.java:2822
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -23425,169 +23780,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1333 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2542 build/trans_presets.java:2548
-#: build/trans_presets.java:2555 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: 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:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2671 build/trans_presets.java:2677
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2696 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2748
-#: build/trans_presets.java:2756 build/trans_presets.java:2771
-#: build/trans_presets.java:2777 build/trans_presets.java:2785
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1654 build/trans_presets.java:1661
+#: build/trans_presets.java:1668 build/trans_presets.java:1674
+#: build/trans_presets.java:1681 build/trans_presets.java:1688
+#: build/trans_presets.java:1703 build/trans_presets.java:1711
+#: build/trans_presets.java:1724 build/trans_presets.java:1738
+#: build/trans_presets.java:1835 build/trans_presets.java:1843
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:2265 build/trans_presets.java:2289
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2630 build/trans_presets.java:2636
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2662
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2681 build/trans_presets.java:2687
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2706 build/trans_presets.java:2713
+#: build/trans_presets.java:2720 build/trans_presets.java:2726
+#: build/trans_presets.java:2732 build/trans_presets.java:2758
+#: build/trans_presets.java:2766 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2795
+#: build/trans_presets.java:2822
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1333 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2542 build/trans_presets.java:2548
-#: build/trans_presets.java:2555 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: 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:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2671 build/trans_presets.java:2677
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2696 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2748
-#: build/trans_presets.java:2756 build/trans_presets.java:2771
-#: build/trans_presets.java:2777 build/trans_presets.java:2785
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1654 build/trans_presets.java:1661
+#: build/trans_presets.java:1668 build/trans_presets.java:1674
+#: build/trans_presets.java:1681 build/trans_presets.java:1688
+#: build/trans_presets.java:1703 build/trans_presets.java:1711
+#: build/trans_presets.java:1724 build/trans_presets.java:1738
+#: build/trans_presets.java:1835 build/trans_presets.java:1843
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:2265 build/trans_presets.java:2289
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2630 build/trans_presets.java:2636
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2662
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2681 build/trans_presets.java:2687
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2706 build/trans_presets.java:2713
+#: build/trans_presets.java:2720 build/trans_presets.java:2726
+#: build/trans_presets.java:2732 build/trans_presets.java:2758
+#: build/trans_presets.java:2766 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2795
+#: build/trans_presets.java:2822
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1333 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2542 build/trans_presets.java:2548
-#: build/trans_presets.java:2555 build/trans_presets.java:2562
-#: build/trans_presets.java:2568 build/trans_presets.java:2574
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: 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:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2671 build/trans_presets.java:2677
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2696 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2748
-#: build/trans_presets.java:2756 build/trans_presets.java:2771
-#: build/trans_presets.java:2777 build/trans_presets.java:2785
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1654 build/trans_presets.java:1661
+#: build/trans_presets.java:1668 build/trans_presets.java:1674
+#: build/trans_presets.java:1681 build/trans_presets.java:1688
+#: build/trans_presets.java:1703 build/trans_presets.java:1711
+#: build/trans_presets.java:1724 build/trans_presets.java:1738
+#: build/trans_presets.java:1835 build/trans_presets.java:1843
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:2265 build/trans_presets.java:2289
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2630 build/trans_presets.java:2636
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2662
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2681 build/trans_presets.java:2687
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2706 build/trans_presets.java:2713
+#: build/trans_presets.java:2720 build/trans_presets.java:2726
+#: build/trans_presets.java:2732 build/trans_presets.java:2758
+#: build/trans_presets.java:2766 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2795
+#: build/trans_presets.java:2822
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
 
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1343
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1344
 msgid "Diesel"
 msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1345
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1346
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1347
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1348
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1349
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1350
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1351
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1352
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1353
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1354
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1355
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1356
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1357
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#: build/trans_presets.java:1358
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -23600,5 +23960,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1351 build/trans_presets.java:1397
+#: build/trans_presets.java:1361 build/trans_presets.java:1407
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23608,5 +23968,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:1354
+#: build/trans_presets.java:1364
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -23617,25 +23977,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1357 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2439
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:1367 build/trans_presets.java:1787
+#: build/trans_presets.java:1797 build/trans_presets.java:2449
+#: build/trans_presets.java:2741
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1368
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1368
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1358 build/trans_presets.java:2349
+#: build/trans_presets.java:1368 build/trans_presets.java:2359
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1369
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -23644,48 +24004,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1360 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:1370 build/trans_presets.java:1788
+#: build/trans_presets.java:1798 build/trans_presets.java:2450
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1372
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1373
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1374
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1375
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1376
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "他の収容能力はWiki を参照:[types]=*。"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1378
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1379
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1384
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1385
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -23693,5 +24053,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1380 build/trans_presets.java:1404
+#: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
 msgstr "レンタル"
@@ -23700,10 +24060,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:1383
+#: build/trans_presets.java:1393
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1398
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -23711,5 +24071,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -23717,10 +24077,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1409
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1412
 msgid "Capacity"
 msgstr "収容台数"
@@ -23729,10 +24089,10 @@
 #. <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:1407
+#: build/trans_presets.java:1417
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1423
 msgctxt "railway"
 msgid "Station"
@@ -23742,5 +24102,5 @@
 #. <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:1416
+#: build/trans_presets.java:1426
 msgctxt "railway"
 msgid "Edit Station"
@@ -23748,5 +24108,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1421
+#: build/trans_presets.java:1431
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -23754,5 +24114,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1434
 msgid "Railway Halt"
 msgstr "停車場"
@@ -23760,5 +24120,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1426
+#: build/trans_presets.java:1436
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -23766,5 +24126,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1443
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -23773,5 +24133,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:1436
+#: build/trans_presets.java:1446
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -23779,5 +24139,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1453
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -23786,5 +24146,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:1446
+#: build/trans_presets.java:1456
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -23796,5 +24156,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1449 build/trans_presets.java:1494
+#: build/trans_presets.java:1459 build/trans_presets.java:1504
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -23802,10 +24162,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1451 build/trans_presets.java:1496
+#: build/trans_presets.java:1461 build/trans_presets.java:1506
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1463
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -23814,10 +24174,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:1456
+#: build/trans_presets.java:1466
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1461 build/trans_presets.java:2441
+#: build/trans_presets.java:1471 build/trans_presets.java:2451
 msgid "Wheelchair"
 msgstr "車いす"
@@ -23826,5 +24186,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1476
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -23833,5 +24193,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:1469
+#: build/trans_presets.java:1479
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -23839,5 +24199,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1485
 msgid "Bus Stop"
 msgstr "バス停"
@@ -23847,5 +24207,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:1479
+#: build/trans_presets.java:1489
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -23854,6 +24214,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1484 build/trans_presets.java:1800
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:1494 build/trans_presets.java:1810
+#: build/trans_presets.java:2501
 msgid "Shelter"
 msgstr "避難所"
@@ -23861,19 +24221,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1485 build/trans_presets.java:2479
+#: build/trans_presets.java:1495 build/trans_presets.java:2489
 msgid "Bench"
 msgstr "ベンチ"
 
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1496
 msgid "Tactile Paving"
 msgstr "点字ブロック"
 
 #. </optional>
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1500
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1501
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -23881,5 +24241,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1499
+#: build/trans_presets.java:1509
 msgid "Taxi"
 msgstr "タクシー"
@@ -23887,5 +24247,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1511
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -23893,10 +24253,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1517
 msgid "Airport"
 msgstr "空港"
 
 #. group "Airport"
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1518
 msgid "Airport Ground"
 msgstr ""
@@ -23904,5 +24264,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1520
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23910,10 +24270,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1524
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1525
 msgid "ICAO"
 msgstr "ICAO"
@@ -23922,5 +24282,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1529
 msgid "Runway"
 msgstr "滑走路"
@@ -23928,5 +24288,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1531
 msgid "Edit Runway"
 msgstr "滑走路の編集"
@@ -23934,5 +24294,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1537
 msgid "Taxiway"
 msgstr "誘導路"
@@ -23940,5 +24300,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1539
 msgid "Edit Taxiway"
 msgstr "誘導路の編集"
@@ -23946,5 +24306,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1545
 msgid "Helipad"
 msgstr ""
@@ -23952,5 +24312,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1547
 msgid "Edit Helipad"
 msgstr ""
@@ -23960,5 +24320,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1543 build/trans_presets.java:1545
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
 msgid "Apron"
 msgstr "エプロン"
@@ -23968,5 +24328,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1548 build/trans_presets.java:1550
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Hangar"
 msgstr "格納庫"
@@ -23977,6 +24337,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+#: build/trans_presets.java:2375
 msgid "Beacon"
 msgstr "ビーコン"
@@ -23986,5 +24346,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1568 build/trans_presets.java:1570
 msgid "Windsock"
 msgstr "吹き流し"
@@ -23993,5 +24353,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1574
 msgid "Terminal"
 msgstr "ターミナル"
@@ -23999,5 +24359,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1576
 msgid "Edit Terminal"
 msgstr "ターミナルの編集"
@@ -24005,15 +24365,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1582
 msgid "Edit Terminal Gate"
 msgstr "ターミナルゲートの編集"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1588
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1589
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -24025,5 +24385,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1580 build/trans_surveyor.java:43
+#: build/trans_presets.java:1590 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -24032,15 +24392,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:1583
+#: build/trans_presets.java:1593
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1596
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1598
 msgid "Motel"
 msgstr "モーテル"
@@ -24048,20 +24408,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1600
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1604
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1605
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1609
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -24069,10 +24429,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1611
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1615
 msgid "Hostel"
 msgstr "ホステル"
@@ -24080,30 +24440,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1617
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1621
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1622
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1627
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1628
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1632
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -24111,10 +24471,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1634
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1639
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -24125,5 +24485,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1630 build/trans_surveyor.java:47
+#: build/trans_presets.java:1640 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -24131,5 +24491,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1642
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -24137,5 +24497,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -24143,73 +24503,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1645 build/trans_presets.java:1653
 msgid "sushi"
 msgstr "寿司"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1648
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -24217,17 +24577,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1650
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1653
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1653
 msgid "chicken"
 msgstr "チキン"
 
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1656
 msgid "Cafe"
 msgstr "カフェ"
@@ -24235,9 +24595,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1658
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1663
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -24245,18 +24605,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1665
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1670
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1671
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1676
 msgid "Bar"
 msgstr "バー"
@@ -24264,9 +24624,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1678
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1683
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -24274,24 +24634,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1685
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1691
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1692
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1693
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1698
 msgid "Museum"
 msgstr "博物館"
@@ -24299,9 +24659,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1700
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1705
 msgid "Zoo"
 msgstr "動物園"
@@ -24310,9 +24670,9 @@
 #. <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:1698
+#: build/trans_presets.java:1708
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1713
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -24320,24 +24680,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1715
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1718
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1720
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1721
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1726
 msgid "Artwork"
 msgstr "美術館"
@@ -24345,5 +24705,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1728
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -24351,19 +24711,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1733
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1740
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1745
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1745
 msgid "topo"
 msgstr "地形"
@@ -24401,5 +24761,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1735 build/trans_style.java:625
+#: build/trans_presets.java:1745 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24407,28 +24767,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1745
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1746
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1746
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1746
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1746
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1737 build/trans_presets.java:1753
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1747 build/trans_presets.java:1763
+#: build/trans_presets.java:1807
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -24438,5 +24798,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1739 build/trans_presets.java:1762
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -24444,5 +24804,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1740 build/trans_presets.java:1763
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "Hiking"
 msgstr "ハイキング"
@@ -24450,6 +24810,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1992
 msgid "Cycling"
 msgstr "サイクリング"
@@ -24457,5 +24817,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1742 build/trans_presets.java:1765
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -24463,6 +24823,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:2046
 msgid "Skiing"
 msgstr "スキー"
@@ -24470,5 +24830,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1744 build/trans_presets.java:1767
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Riding"
 msgstr "乗馬"
@@ -24476,46 +24836,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1745 build/trans_presets.java:1768
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1757
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1762
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1765
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1780
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -24523,29 +24883,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1775 build/trans_presets.java:1785
+#: build/trans_presets.java:1785 build/trans_presets.java:1795
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1790
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1800
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1801
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1803
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1811
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -24553,25 +24913,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1804 build/trans_presets.java:1810
+#: build/trans_presets.java:1814 build/trans_presets.java:1820
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1816
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1817
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1823
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1824
 msgid "Castle"
 msgstr "城"
@@ -24580,19 +24940,19 @@
 #. <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:1817
+#: build/trans_presets.java:1827
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1831
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1832
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1837
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -24601,9 +24961,9 @@
 #. <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:1830
+#: build/trans_presets.java:1840
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1845
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -24611,10 +24971,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1847
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1851
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -24622,5 +24982,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1853
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -24628,15 +24988,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1858
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1859
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1863
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -24644,55 +25004,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1865
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1869
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1874
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1875
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1885
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1886
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1887
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1891
 msgid "Playground"
 msgstr "遊び場"
@@ -24700,35 +25060,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1893
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1894 build/trans_presets.java:2712
+#: build/trans_presets.java:1904 build/trans_presets.java:2722
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1905
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -24742,6 +25102,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1901 build/trans_presets.java:1910
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1911 build/trans_presets.java:1920
+#: build/trans_presets.java:1929 build/trans_presets.java:1938
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -25133,6 +25493,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25166,225 +25526,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1924
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1925
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1933
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1934
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1943
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1949
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1955
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1956
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1957
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -25423,21 +25783,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: 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:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2044 build/trans_presets.java:2053
+#: build/trans_presets.java:2060 build/trans_presets.java:2068
+#: build/trans_presets.java:2074 build/trans_presets.java:2080
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2122 build/trans_presets.java:2128
+#: build/trans_presets.java:2134 build/trans_presets.java:2140
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
 msgid "type"
 msgstr "タイプ"
@@ -25476,203 +25836,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: 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:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2044 build/trans_presets.java:2053
+#: build/trans_presets.java:2060 build/trans_presets.java:2068
+#: build/trans_presets.java:2074 build/trans_presets.java:2080
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2122 build/trans_presets.java:2128
+#: build/trans_presets.java:2134 build/trans_presets.java:2140
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
 msgid "pitch"
 msgstr "運動場"
 
-#: 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:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2044 build/trans_presets.java:2053
+#: build/trans_presets.java:2060 build/trans_presets.java:2068
+#: build/trans_presets.java:2074 build/trans_presets.java:2080
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2122 build/trans_presets.java:2128
+#: build/trans_presets.java:2134 build/trans_presets.java:2140
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: 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:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2044 build/trans_presets.java:2053
+#: build/trans_presets.java:2060 build/trans_presets.java:2068
+#: build/trans_presets.java:2074 build/trans_presets.java:2080
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2122 build/trans_presets.java:2128
+#: build/trans_presets.java:2134 build/trans_presets.java:2140
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
 msgid "stadium"
 msgstr "スタジアム"
 
-#: 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:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1960 build/trans_presets.java:1966
+#: build/trans_presets.java:1972 build/trans_presets.java:1978
+#: build/trans_presets.java:1984 build/trans_presets.java:1990
+#: build/trans_presets.java:1996 build/trans_presets.java:2002
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2026
+#: build/trans_presets.java:2032 build/trans_presets.java:2038
+#: build/trans_presets.java:2044 build/trans_presets.java:2053
+#: build/trans_presets.java:2060 build/trans_presets.java:2068
+#: build/trans_presets.java:2074 build/trans_presets.java:2080
+#: build/trans_presets.java:2086 build/trans_presets.java:2092
+#: build/trans_presets.java:2098 build/trans_presets.java:2104
+#: build/trans_presets.java:2110 build/trans_presets.java:2116
+#: build/trans_presets.java:2122 build/trans_presets.java:2128
+#: build/trans_presets.java:2134 build/trans_presets.java:2140
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1962
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1963
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1968
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1969
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1974
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1975
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1980
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1981
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1986
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1987
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1993
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1998
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1999
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2004
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2005
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2010
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2011
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2016
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2017
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2022
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2023
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2029
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2034
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2035
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2040
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2041
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -25680,52 +26040,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2048
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2051
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2051
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2051
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2051
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2052
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Shooting"
 msgstr "射撃"
@@ -25733,127 +26093,127 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2057
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2063
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2064
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2065
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2070
 msgid "Football"
 msgstr "フットボール"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2082
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2083
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2088
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2089
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2094
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2095
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2100
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2101
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2106
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2107
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2112
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2113
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2118
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2119
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2124
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2125
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2130
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2131
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2136
 msgid "Pelota"
 msgstr "ペロタ"
@@ -25861,50 +26221,50 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2137
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2142
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2143
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2148
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2149
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2154
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2155
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2150
+#: build/trans_presets.java:2160
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2161
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2168
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2170
 msgid "Building"
 msgstr "建物"
@@ -25912,5 +26272,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2173
 msgid "Public Building"
 msgstr "公共の建物"
@@ -25918,10 +26278,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2175
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2179
 msgid "Town hall"
 msgstr "役場"
@@ -25929,10 +26289,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2181
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2185
 msgid "Embassy"
 msgstr "大使館"
@@ -25940,10 +26300,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2187
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2191
 msgid "Courthouse"
 msgstr "裁判所"
@@ -25952,10 +26312,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:2184
+#: build/trans_presets.java:2194
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2198
 msgid "Prison"
 msgstr "刑務所"
@@ -25964,10 +26324,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:2191
+#: build/trans_presets.java:2201
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2205
 msgid "Police"
 msgstr "警察"
@@ -25977,10 +26337,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:2199
+#: build/trans_presets.java:2209
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2213
 msgid "Fire Station"
 msgstr "消防署"
@@ -25989,10 +26349,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:2206
+#: build/trans_presets.java:2216
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2220
 msgid "Post Office"
 msgstr "郵便局"
@@ -26000,5 +26360,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2222
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -26006,15 +26366,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2228
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2229
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2233
 msgid "School"
 msgstr "学校"
@@ -26022,10 +26382,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2235
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2239
 msgid "University"
 msgstr "大学"
@@ -26033,10 +26393,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2241
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2245
 msgid "College"
 msgstr "短大"
@@ -26044,5 +26404,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2247
 msgid "Edit College"
 msgstr "短大の編集"
@@ -26050,5 +26410,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2252
 msgid "Cinema"
 msgstr "映画館"
@@ -26057,10 +26417,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:2245
+#: build/trans_presets.java:2255
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2259
 msgid "Library"
 msgstr "図書館"
@@ -26069,9 +26429,9 @@
 #. <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:2252
+#: build/trans_presets.java:2262
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2267
 msgid "Arts Centre"
 msgstr "美術館"
@@ -26079,10 +26439,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2269
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2273
 msgid "Theatre"
 msgstr "劇場"
@@ -26091,10 +26451,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:2266
+#: build/trans_presets.java:2276
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2280
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -26104,5 +26464,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:2274
+#: build/trans_presets.java:2284
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -26111,6 +26471,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "Religion"
 msgstr "宗教"
@@ -26119,66 +26479,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3102
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:2287 build/trans_presets.java:3112
+#: build/trans_presets.java:3121
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "Denomination"
 msgstr "宗派"
@@ -26187,81 +26547,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3103
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:2288 build/trans_presets.java:3113
+#: build/trans_presets.java:3122
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2292
 msgid "Addresses"
 msgstr "住所"
@@ -26270,5 +26630,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:2285
+#: build/trans_presets.java:2295
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -26276,5 +26636,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2297
 msgid "House number"
 msgstr "番地"
@@ -26282,25 +26642,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2299
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2300
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2301
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2302
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2303
 msgid "Country code"
 msgstr "国コード"
@@ -26309,5 +26669,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:2299
+#: build/trans_presets.java:2309
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -26315,61 +26675,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2311
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2311
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2311
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2311
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2314
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2315
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2316
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2320
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2321
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2324
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2324
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2324
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2326
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -26377,25 +26737,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2330
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2331
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2335
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2336
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2340
 msgid "Lighthouse"
 msgstr "灯台"
@@ -26403,10 +26763,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2342
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2346
 msgid "Windmill"
 msgstr "風車"
@@ -26414,10 +26774,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2348
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2352
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -26426,41 +26786,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2355
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2348 build/trans_presets.java:2391
+#: build/trans_presets.java:2358 build/trans_presets.java:2401
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2358
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2358
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2358
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2358
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2359
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2359
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2359
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2361
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -26470,10 +26830,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:2355
+#: build/trans_presets.java:2365
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2369
 msgid "Crane"
 msgstr "クレーン"
@@ -26481,5 +26841,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2371
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -26487,10 +26847,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2377
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2381
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -26498,10 +26858,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2383
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2387
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -26509,23 +26869,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2389
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2392
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2392
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2392
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2395
 msgid "Power Generator"
 msgstr "発電機"
@@ -26535,35 +26895,35 @@
 #. 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:2389
+#: build/trans_presets.java:2399
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2401
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2404
 msgid "Power Station"
 msgstr "変電所"
@@ -26572,10 +26932,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:2397
+#: build/trans_presets.java:2407
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2403
+#: build/trans_presets.java:2413
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -26584,5 +26944,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:2406
+#: build/trans_presets.java:2416
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -26590,10 +26950,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2409 build/trans_presets.java:2426
+#: build/trans_presets.java:2419 build/trans_presets.java:2436
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2421
 msgid "Power Tower"
 msgstr "送電塔"
@@ -26604,23 +26964,23 @@
 #. 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:2416
+#: build/trans_presets.java:2426
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2427
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2427
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2428
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2430
 msgid "Power Line"
 msgstr "送電線"
@@ -26629,74 +26989,74 @@
 #. <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:2423
+#: build/trans_presets.java:2433
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2434
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2434
 msgid "line"
 msgstr "線"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2434
 msgid "minor_line"
 msgstr "細い線"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2439
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2440
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2440
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2440
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2440
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2440
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2443
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2444
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2451
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2442 build/trans_presets.java:2732
+#: build/trans_presets.java:2452 build/trans_presets.java:2742
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2454
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2459
 msgid "Telephone"
 msgstr "電話"
@@ -26705,5 +27065,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:2452
+#: build/trans_presets.java:2462
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -26711,5 +27071,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2455 build/trans_presets.java:2733
+#: build/trans_presets.java:2465 build/trans_presets.java:2743
 msgid "Coins"
 msgstr "コイン"
@@ -26717,5 +27077,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2456 build/trans_presets.java:2734
+#: build/trans_presets.java:2466 build/trans_presets.java:2744
 msgid "Notes"
 msgstr "備考"
@@ -26723,5 +27083,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2457 build/trans_presets.java:2735
+#: build/trans_presets.java:2467 build/trans_presets.java:2745
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -26729,5 +27089,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2458 build/trans_presets.java:2736
+#: build/trans_presets.java:2468 build/trans_presets.java:2746
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -26735,15 +27095,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2459 build/trans_presets.java:2737
+#: build/trans_presets.java:2469 build/trans_presets.java:2747
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2470
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2472
 msgid "Recycling"
 msgstr "リサイクル"
@@ -26752,5 +27112,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:2465
+#: build/trans_presets.java:2475
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -26758,35 +27118,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2477
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2478
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2479
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2480
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2481
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2482
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2484
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -26794,5 +27154,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2486
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -26801,31 +27161,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2492
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2493
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2493
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2493
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "brown"
 msgstr "茶"
@@ -26904,5 +27264,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2484 build/trans_style.java:3157
+#: build/trans_presets.java:2494 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26912,31 +27272,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2494
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2495
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2497
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2498
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -26945,30 +27305,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2490 build/trans_presets.java:2972
+#: build/trans_presets.java:2500 build/trans_presets.java:2982
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2500
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2500
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2500
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2502
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2503
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2505
 msgid "Fountain"
 msgstr "噴水"
@@ -26977,10 +27337,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:2498
+#: build/trans_presets.java:2508
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2512
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -26989,10 +27349,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:2505
+#: build/trans_presets.java:2515
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2519
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -27001,5 +27361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2522
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -27007,5 +27367,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2525
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -27013,15 +27373,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2527
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2533
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2534
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -27029,10 +27389,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2536
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2541
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -27041,28 +27401,28 @@
 #. <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:2534
+#: build/trans_presets.java:2544
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2548
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2549
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2554
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2555
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2560
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -27070,9 +27430,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2562
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2567
 msgid "Kiosk"
 msgstr "キオスク"
@@ -27080,27 +27440,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2569
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2574
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2575
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2580
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2581
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2586
 msgid "Butcher"
 msgstr "精肉店"
@@ -27108,9 +27468,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2588
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2593
 msgid "Baker"
 msgstr "パン屋"
@@ -27118,9 +27478,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2595
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2600
 msgid "Florist"
 msgstr "生花店"
@@ -27128,18 +27488,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2602
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2607
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2608
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2613
 msgid "Alcohol"
 msgstr "酒屋"
@@ -27147,54 +27507,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2615
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2620
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2621
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2626
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2627
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2632
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2633
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2638
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2639
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2644
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2645
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2650
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -27202,9 +27562,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2652
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2657
 msgid "Hardware"
 msgstr "金物屋"
@@ -27212,9 +27572,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2659
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2664
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -27222,54 +27582,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2666
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2671
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2672
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2677
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2678
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2683
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2684
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2689
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2690
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2695
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2696
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2701
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -27277,9 +27637,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2703
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2708
 msgid "Laundry"
 msgstr "ランドリー"
@@ -27287,9 +27647,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2710
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2715
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -27297,24 +27657,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2717
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2723
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2728
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2729
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. <separator/>
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2735
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -27322,5 +27682,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2737
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -27328,97 +27688,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2739
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2748
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2751
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2752
 msgid "Bank"
 msgstr "銀行"
@@ -27426,14 +27786,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2754
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2749 build/trans_presets.java:2758
+#: build/trans_presets.java:2759 build/trans_presets.java:2768
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2761
 msgid "Money Exchange"
 msgstr "両替"
@@ -27441,5 +27801,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2763
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -27447,15 +27807,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2770
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2775
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2776
 msgid "Doctors"
 msgstr "医院"
@@ -27463,18 +27823,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2778
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2783
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2784
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2789
 msgid "Pharmacy"
 msgstr "薬局"
@@ -27482,5 +27842,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2791
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -27488,9 +27848,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2793
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2797
 msgid "Hospital"
 msgstr "病院"
@@ -27498,10 +27858,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2799
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2803
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -27510,5 +27870,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:2796
+#: build/trans_presets.java:2806
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -27517,20 +27877,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2809
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2810
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2812
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2813
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -27538,5 +27898,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2816
 msgid "Veterinary"
 msgstr "動物病院"
@@ -27545,64 +27905,64 @@
 #. <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:2809
+#: build/trans_presets.java:2819
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2826
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2827
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2828
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2829
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2834
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2835
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2840
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2841
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2846
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2847
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2852
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2853
 msgid "Edit County"
 msgstr "郡の編集"
@@ -27610,15 +27970,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2859
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2860
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2865
 msgid "Town"
 msgstr "町"
@@ -27626,10 +27986,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2867
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2872
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -27637,25 +27997,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2874
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2879
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2880
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2885
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2886
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -27663,5 +28023,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2892
 msgid "Locality"
 msgstr "地域"
@@ -27669,10 +28029,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2894
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2899
 msgid "Island"
 msgstr "島"
@@ -27680,10 +28040,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2901
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2906
 msgid "Islet"
 msgstr "小島"
@@ -27691,5 +28051,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2908
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -27697,5 +28057,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2914
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -27703,10 +28063,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2916
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2920
 msgid "Peak"
 msgstr "山頂"
@@ -27714,10 +28074,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2922
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2927
 msgid "Glacier"
 msgstr "氷河"
@@ -27725,10 +28085,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2929
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2934
 msgid "Volcano"
 msgstr "火山"
@@ -27736,70 +28096,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2936
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2942
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2943
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2944
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2949
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2950
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2955
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2956
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2961
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2962
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2967
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2968
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2974
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2975
 msgid "Tree"
 msgstr "樹木・林"
@@ -27808,15 +28168,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:2968
+#: build/trans_presets.java:2978
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2983
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2985
 msgid "Wood"
 msgstr "森"
@@ -27825,5 +28185,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:2978
+#: build/trans_presets.java:2988
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -27831,17 +28191,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2981 build/trans_presets.java:2990
+#: build/trans_presets.java:2991 build/trans_presets.java:3000
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2981 build/trans_presets.java:2990
+#: build/trans_presets.java:2991 build/trans_presets.java:3000
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2981 build/trans_presets.java:2990
+#: build/trans_presets.java:2991 build/trans_presets.java:3000
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2993
 msgid "Forest"
 msgstr "森林"
@@ -27850,14 +28210,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:2986
+#: build/trans_presets.java:2996
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3002
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3003
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -27865,25 +28225,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3008
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3009
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3013
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3014
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3018
 msgid "Fell"
 msgstr "山(Fell)"
@@ -27891,10 +28251,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3020
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3024
 msgid "Heath"
 msgstr "荒れ地"
@@ -27902,5 +28262,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3026
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -27908,5 +28268,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3031
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -27915,45 +28275,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:3024
+#: build/trans_presets.java:3034
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3039
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3030
+#: build/trans_presets.java:3040
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3045
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3046
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3051
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3052
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3057
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3058
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -27961,25 +28321,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3064
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3065
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3069
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3070
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3075
 msgid "Village Green"
 msgstr "里山"
@@ -27987,10 +28347,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3077
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3082
 msgid "Common"
 msgstr "共有地"
@@ -27998,20 +28358,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3084
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3088
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3089
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3093
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -28019,5 +28379,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3095
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -28025,15 +28385,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3101
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3102
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3107
 msgid "Graveyard"
 msgstr "墓所"
@@ -28041,9 +28401,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3109
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3115
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -28051,39 +28411,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3117
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3124
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:3125
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3130
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3131
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3136
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3137
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3142
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -28091,15 +28451,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3144
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3149
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3150
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -28107,50 +28467,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3156
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3157
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3162
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3163
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3168
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3169
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3174
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3175
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3180
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3181
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -28160,5 +28520,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:3184
+#: build/trans_presets.java:3193
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -28167,10 +28527,14 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3190
+#. item "Relations/Boundary" combo "Administrative level"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3199 build/trans_presets.java:3216
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3191
+#. item "Relations/Boundary" role "outer segment"
+#: build/trans_presets.java:3200 build/trans_presets.java:3217
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -28178,5 +28542,57 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3203
+msgid "Boundary"
+msgstr ""
+
+#. item "Relations/Boundary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
+#: build/trans_presets.java:3208
+msgid "Edit Boundary"
+msgstr ""
+
+#. item "Relations/Boundary" text "Name"
+#. <optional>
+#: build/trans_presets.java:3212
+msgid "Boundary type"
+msgstr ""
+
+#. item "Relations/Boundary" combo "Boundary type"
+#: build/trans_presets.java:3212
+msgid "administrative"
+msgstr ""
+
+#: build/trans_presets.java:3212
+msgid "national"
+msgstr ""
+
+#: build/trans_presets.java:3212
+msgid "civil"
+msgstr ""
+
+#: build/trans_presets.java:3212
+msgid "political"
+msgstr ""
+
+#: build/trans_presets.java:3213
+msgid "Administrative level"
+msgstr ""
+
+#. item "Relations/Boundary" role "inner segment"
+#: build/trans_presets.java:3218
+msgid "Sub area"
+msgstr ""
+
+#. item "Relations/Boundary" role "Sub area"
+#: build/trans_presets.java:3219
+msgid "Administration centre"
+msgstr ""
+
+#. item "Relations/Boundary" role "Administration centre"
+#. </roles>
+#: build/trans_presets.java:3222
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -28185,5 +28601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3225
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -28191,34 +28607,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3227
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -28227,15 +28643,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3232
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3233
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3234
 msgid "to way"
 msgstr "ウェイへ"
@@ -28243,5 +28659,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3209
+#: build/trans_presets.java:3237
 msgid "Route"
 msgstr "ルート"
@@ -28250,5 +28666,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3240
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -28256,5 +28672,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "Route type"
 msgstr "ルート種類"
@@ -28345,5 +28761,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3214 build/trans_style.java:233
+#: build/trans_presets.java:3242 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28353,17 +28769,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "ski"
 msgstr "スキー"
@@ -28423,5 +28839,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3214 build/trans_style.java:247
+#: build/trans_presets.java:3242 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28430,9 +28846,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3242
 msgid "detour"
 msgstr "迂回路"
@@ -28446,10 +28862,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3214 build/trans_style.java:1208
+#: build/trans_presets.java:3242 build/trans_style.java:1208
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3245
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -28457,31 +28873,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3220
+#: build/trans_presets.java:3248
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3250
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3250
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3250
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3250
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3250
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3251
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -28490,30 +28906,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3254
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3255
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3256
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3257
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3258
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3259
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -31913,177 +32329,4 @@
 msgstr "砂浜"
 
-#. color natural
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="tree"/>
-#. <icon src="misc/landmark/trees.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--route tags -->
-#.
-#. <rule>
-#. <condition k="route" v="bus"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="ferry"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="flight"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="ncn"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="subsea"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="ski"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="tour"/>
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3556 build/trans_style.java:3564
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-msgid "route"
-msgstr "ルート"
-
-#. color route
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--boundary tags -->
-#.
-#. <rule>
-#. <condition k="boundary" v="national"/>
-#. color boundary
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="admin_level" v="1"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="2"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="3"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="4"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="5"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="6"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="7"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="8"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="9"/>
-#. color boundary
-#. </rule>
-#. <rule>
-#. <condition k="admin_level" v="10"/>
-#. color boundary
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boundary" v="administrative"/>
-#. color boundary
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boundary" v="civil"/>
-#. color boundary
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boundary" v="political"/>
-#. color boundary
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3622 build/trans_style.java:3630
-#: build/trans_style.java:3634 build/trans_style.java:3638
-#: build/trans_style.java:3642 build/trans_style.java:3646
-#: build/trans_style.java:3650 build/trans_style.java:3654
-#: build/trans_style.java:3658 build/trans_style.java:3662
-#: build/trans_style.java:3666 build/trans_style.java:3671
-#: build/trans_style.java:3679 build/trans_style.java:3687
-#: build/trans_style.java:3695
-msgid "boundary"
-msgstr "行政区境"
-
 #. color deprecated
 #. <icon src="misc/landmark/mountain_pass.png"/>
@@ -32602,7 +32845,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "Command Stack: {0}"
-#~ msgstr "指示の集積: {0}"
-
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -33042,4 +33282,7 @@
 #~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
 #~ "へと戻します。"
+
+#~ msgid "Command Stack: {0}"
+#~ msgstr "指示の集積: {0}"
 
 #~ msgid "The date in file \"{0}\" could not be parsed."
@@ -33631,4 +33874,7 @@
 #~ msgstr "プリミティブ更新中"
 
+#~ msgid "Deleted or moved primitives"
+#~ msgstr "削除または移動されたプリミティブ"
+
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33670,4 +33916,18 @@
 #~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ"
 #~ "ミティブごとにリクエストするには、無効にする。"
+
+#~ msgid ""
+#~ "<html>There are {0} primitives in your local dataset which<br>might be "
+#~ "deleted on the server. If you later try to delete or<br>update them the "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "<strong>{2}</strong> to ignore.<br></html>"
+#~ msgstr ""
+#~ "<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
+#~ "バーでは削除されています。これらをあとで削除したり、更新しようとすると、"
+#~ "サーバーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミ"
+#~ "ティブの状態を確認するには<br><strong>{1}</strong>をクリックしてくださ"
+#~ "い。 <br>無視するには、<strong>{2}</strong>をクリックしてください。<br></"
+#~ "html>"
 
 #~ msgid "Primitive already deleted"
