Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 22569)
+++ applications/editors/josm/i18n/po/ja.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 03:57+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 22:27+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -28,6 +28,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -241,4 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -248,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -303,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "キャンセル"
@@ -371,4 +373,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -427,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1386,5 +1389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1450,4 +1453,53 @@
 msgid "Preferences"
 msgstr "設定"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "調査者..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "バーガー"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "確認"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "セレクションに加える"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1489,4 +1541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1724,4 +1777,5 @@
 msgstr "簡略化には、少なくとも1つのウェイを選択してください。"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1729,4 +1783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
+#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "はい"
@@ -1773,8 +1828,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "現在の選択は分割できません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2982,4 +3036,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
@@ -3009,5 +3064,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58
+#: build/specialmessages.java:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3220,7 +3275,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見てい"
@@ -3253,10 +3309,5 @@
 msgstr[0] "{0} 個のノードを移動"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "オブジェクト ''{0}'' を取り除いた。"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3264,4 +3315,10 @@
 msgid_plural "Purged {0} objects"
 msgstr[0] "{0}オブジェクトの削除"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "オブジェクト ''{0}'' を取り除いた。"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3663,5 +3720,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3674,6 +3731,6 @@
 "い。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3683,10 +3740,12 @@
 msgstr "ID {0} のウェイの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3694,5 +3753,5 @@
 msgstr "ID {0} のノードの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3701,5 +3760,5 @@
 msgstr "ID {0} のリレーションの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3708,4 +3767,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "ID {1} のタイプ {0} の結合対象が見つかりません"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4008,5 +4075,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "鉄道"
@@ -4279,69 +4346,69 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4354,9 +4421,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4365,45 +4432,45 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "未保存のOSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "復元"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4412,14 +4479,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
@@ -4438,10 +4521,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4449,5 +4532,5 @@
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4455,5 +4538,5 @@
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4464,5 +4547,5 @@
 msgstr "メニュー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "音声"
@@ -4562,17 +4645,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "数値"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "中国料理"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "商用"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5305,5 +5385,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "全て"
@@ -5949,5 +6029,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "リレーション"
@@ -6041,10 +6121,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -6650,4 +6730,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7109,5 +7191,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7151,111 +7232,112 @@
 #: 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:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: 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:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 build/trans_presets.java:2391
-#: build/trans_presets.java:2397 build/trans_presets.java:2403
-#: build/trans_presets.java:2409 build/trans_presets.java:2415
-#: build/trans_presets.java:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 build/trans_presets.java:2253
+#: build/trans_presets.java:2259 build/trans_presets.java:2265
+#: build/trans_presets.java:2271 build/trans_presets.java:2277
+#: build/trans_presets.java:2283 build/trans_presets.java:2289
+#: build/trans_presets.java:2295 build/trans_presets.java:2301
+#: build/trans_presets.java:2307 build/trans_presets.java:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "名前"
@@ -8334,21 +8416,25 @@
 msgstr "選択中のブックマークの名前を変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8358,10 +8444,10 @@
 "付けてください）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "境界囲み"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8370,15 +8456,15 @@
 msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "緯度の値は、[-90,90]の範囲にある必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "経度の値は[-180,180]の範囲で必須です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8527,8 +8613,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "タイプ"
@@ -8557,6 +8643,6 @@
 #: 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:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "不明な"
@@ -8983,7 +9069,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "不正なアップロードコメント"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9185,7 +9270,9 @@
 msgstr "ファイル名を選択"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: build/specialmessages.java:89
 msgid "No"
 msgstr "いいえ"
@@ -9497,17 +9584,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "不正なアップロードコメント"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "逆順"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "続ける"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9525,7 +9609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "キャンセルしてエディタに戻る"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9534,7 +9617,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "次回は表示しない"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9737,5 +9819,5 @@
 msgstr[0] "{0} オブジェクトをアップロード中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9926,5 +10008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "説明"
@@ -11642,5 +11724,5 @@
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11651,35 +11733,35 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "HDOP（垂直精度劣化度）の値の円を描いてください"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率（赤=高い、緑=低い、可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -11687,5 +11769,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11707,5 +11789,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11747,5 +11829,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11759,65 +11841,70 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "ウェイの向きを矢印で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "一方通行など、必要なときのみ向きを表示"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "アクティブなレイヤー以外は別の色で表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチエイリアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "GPX読み込み時にマーカーを作成。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "作者"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "ディーゼル"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "ボート"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11827,9 +11914,9 @@
 "る。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "GPSトラックのポイント間の線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11837,34 +11924,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11872,13 +11959,13 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11888,9 +11975,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11898,55 +11985,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "ウエイポイントの記述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -12317,7 +12403,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "測定するレイヤー"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13211,5 +13296,5 @@
 msgstr "サーバからの応答をパース中..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14888,5 +14973,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14917,5 +15002,5 @@
 "動作停止します。"
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15175,5 +15260,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15628,5 +15713,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "建物"
@@ -15876,5 +15961,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -17881,7 +17966,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "解決したバージョン:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18505,13 +18589,13 @@
 msgstr "テラスハウス"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "靴店の編集"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "区切り"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19606,5 +19690,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -21630,5 +21714,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "道路番号"
@@ -22167,5 +22251,5 @@
 #: 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:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "金属"
@@ -22178,5 +22262,5 @@
 #: 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:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "森"
@@ -22454,4 +22538,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22480,9 +22626,40 @@
 #: 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:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 build/trans_presets.java:1847
+#: build/trans_presets.java:1848 build/trans_presets.java:1849
+#: build/trans_presets.java:1850 build/trans_presets.java:1864
+#: build/trans_presets.java:1865 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "はい"
@@ -22592,9 +22769,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: build/trans_presets.java:1847 build/trans_presets.java:1848
+#: build/trans_presets.java:1849 build/trans_presets.java:1850
+#: build/trans_presets.java:1864 build/trans_presets.java:1865
+#: build/trans_presets.java:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "いいえ"
@@ -23018,5 +23226,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "ハイキング"
@@ -23051,5 +23259,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "中間"
@@ -23063,5 +23271,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -23190,4 +23406,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23219,14 +23443,18 @@
 #: 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:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "操作員"
@@ -23488,12 +23716,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "高度"
@@ -24348,5 +24576,5 @@
 #: 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:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "電圧"
@@ -24658,6 +24886,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24709,32 +24939,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 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:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -24743,4 +24973,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24793,174 +25024,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 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:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 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:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 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:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+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:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10%エタノール混合)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(85%エタノール混合)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 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"
@@ -24990,7 +25222,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "参照番号"
@@ -25006,5 +25238,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "地下"
@@ -25017,6 +25249,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "料金"
@@ -25192,5 +25424,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "車いす"
@@ -25227,6 +25459,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "避難所"
@@ -25234,5 +25466,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "ベンチ"
@@ -25351,5 +25583,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "ビーコン"
@@ -25409,11 +25641,241 @@
 msgstr "ホテルの編集"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "駅"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "電話番号"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "モーテル"
@@ -25421,20 +25883,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -25442,10 +25904,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "ホステル"
@@ -25453,30 +25915,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -25484,10 +25946,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -25498,5 +25960,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -25504,11 +25966,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -25516,78 +25978,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "寿司"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -25595,17 +26058,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "チキン"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "カフェ"
@@ -25613,9 +26088,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -25623,19 +26099,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "バー"
@@ -25643,9 +26120,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -25653,24 +26131,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "博物館"
@@ -25678,9 +26157,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "動物園"
@@ -25689,9 +26168,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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -25699,24 +26178,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "美術館"
@@ -25724,5 +26203,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -25730,19 +26209,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "地形"
@@ -25780,5 +26259,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25786,28 +26265,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -25817,5 +26296,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -25823,5 +26302,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "ハイキング"
@@ -25829,6 +26308,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "サイクリング"
@@ -25836,5 +26315,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -25842,6 +26321,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "スキー"
@@ -25849,5 +26328,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "乗馬"
@@ -25855,54 +26334,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "電柱"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -25910,29 +26388,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -25940,25 +26418,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "城"
@@ -25967,19 +26445,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -25988,9 +26466,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -25998,10 +26476,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -26009,5 +26487,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -26015,15 +26493,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -26031,55 +26509,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "遊び場"
@@ -26087,35 +26565,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -26129,6 +26607,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -26544,6 +27022,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26578,240 +27056,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "アメリカンフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "カナディアンフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "ゲーリックフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "ラグビーリーグ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "(通常の)ラグビー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -26853,23 +27331,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: 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:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 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 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "タイプ"
@@ -26911,211 +27389,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: 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:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 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 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "運動場"
 
-#: 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:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 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 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: 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:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 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 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "スタジアム"
 
-#: 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:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 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 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -27123,52 +27601,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "射撃"
@@ -27176,163 +27654,163 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "ペロタ"
@@ -27340,41 +27818,41 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "建物"
@@ -27382,5 +27860,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "公共の建物"
@@ -27388,10 +27866,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "役場"
@@ -27399,10 +27877,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "大使館"
@@ -27410,10 +27888,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "裁判所"
@@ -27422,10 +27900,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "刑務所"
@@ -27434,10 +27912,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "警察"
@@ -27447,10 +27925,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "消防署"
@@ -27459,10 +27937,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "郵便局"
@@ -27470,5 +27948,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -27476,15 +27954,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "学校"
@@ -27492,10 +27970,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "大学"
@@ -27503,10 +27981,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "短大"
@@ -27514,5 +27992,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "短大の編集"
@@ -27520,5 +27998,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "映画館"
@@ -27527,10 +28005,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "図書館"
@@ -27539,9 +28017,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27549,10 +28027,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "劇場"
@@ -27561,10 +28039,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -27574,5 +28052,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -27581,6 +28059,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "宗教"
@@ -27589,66 +28067,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "宗派"
@@ -27657,81 +28135,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "住所"
@@ -27740,5 +28218,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -27746,5 +28224,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "番地"
@@ -27752,25 +28230,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "国コード"
@@ -27779,5 +28257,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -27785,61 +28263,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -27847,25 +28325,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "灯台"
@@ -27873,10 +28351,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "風車"
@@ -27884,10 +28362,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -27896,41 +28374,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -27940,10 +28418,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "クレーン"
@@ -27951,5 +28429,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -27957,10 +28435,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -27968,10 +28446,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -27979,23 +28457,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "発電機"
@@ -28005,35 +28483,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "変電所"
@@ -28042,10 +28520,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -28054,5 +28532,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -28060,10 +28538,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "送電塔"
@@ -28074,23 +28552,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "送電線"
@@ -28099,20 +28577,20 @@
 #. <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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28120,55 +28598,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 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:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "電話"
@@ -28177,5 +28655,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -28183,5 +28661,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "コイン"
@@ -28189,5 +28667,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "備考"
@@ -28195,5 +28673,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -28201,5 +28679,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -28207,15 +28685,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "リサイクル"
@@ -28224,5 +28702,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -28230,35 +28708,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -28266,5 +28744,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -28273,31 +28751,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "茶"
@@ -28376,5 +28854,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28384,31 +28862,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -28417,30 +28895,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "噴水"
@@ -28449,10 +28927,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -28461,10 +28939,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -28473,5 +28951,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -28479,5 +28957,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -28485,15 +28963,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -28501,10 +28979,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -28513,28 +28991,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:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -28542,9 +29020,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "キオスク"
@@ -28552,27 +29030,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "精肉店"
@@ -28580,9 +29058,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "パン屋"
@@ -28590,9 +29068,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "生花店"
@@ -28600,18 +29078,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "酒屋"
@@ -28619,54 +29097,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -28674,9 +29152,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "金物屋"
@@ -28684,9 +29162,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -28694,54 +29172,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -28749,9 +29227,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "ランドリー"
@@ -28759,9 +29237,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -28769,24 +29247,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -28794,5 +29272,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -28800,97 +29278,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "銀行"
@@ -28898,14 +29376,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "両替"
@@ -28913,5 +29391,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -28919,15 +29397,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "医院"
@@ -28935,18 +29413,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "薬局"
@@ -28954,5 +29432,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -28960,9 +29438,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "病院"
@@ -28970,10 +29448,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -28982,5 +29460,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -28989,20 +29467,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "ポイント名"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "電話番号"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -29010,5 +29483,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "動物病院"
@@ -29017,64 +29490,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:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "郡の編集"
@@ -29082,15 +29555,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "町"
@@ -29098,10 +29571,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -29109,25 +29582,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -29135,5 +29608,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "地域"
@@ -29141,10 +29614,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "島"
@@ -29152,10 +29625,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "小島"
@@ -29163,5 +29636,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -29169,5 +29642,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -29175,10 +29648,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "山頂"
@@ -29186,10 +29659,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "氷河"
@@ -29197,10 +29670,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "火山"
@@ -29208,70 +29681,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "樹木・林"
@@ -29280,15 +29753,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "森"
@@ -29297,5 +29770,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -29303,17 +29776,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "森林"
@@ -29322,14 +29795,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -29337,25 +29810,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "山(Fell)"
@@ -29363,10 +29836,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "荒れ地"
@@ -29374,5 +29847,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -29380,5 +29853,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -29387,45 +29860,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -29433,25 +29906,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "里山"
@@ -29459,10 +29932,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "共有地"
@@ -29470,20 +29943,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -29491,5 +29964,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -29497,15 +29970,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "墓所"
@@ -29513,9 +29986,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -29523,39 +29996,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -29563,15 +30036,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -29579,50 +30052,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -29632,5 +30105,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -29642,5 +30115,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "外側のセグメント"
@@ -29648,5 +30121,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -29654,5 +30127,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29663,5 +30136,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29669,36 +30142,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29706,5 +30179,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -29713,5 +30186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -29719,34 +30192,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -29755,15 +30228,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "ウェイへ"
@@ -29771,5 +30244,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "ルート"
@@ -29778,5 +30251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -29784,5 +30257,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "ルート種類"
@@ -29890,5 +30363,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29899,17 +30372,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "スキー"
@@ -29977,5 +30450,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29985,9 +30458,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "迂回路"
@@ -30001,10 +30474,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -30012,31 +30485,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -30045,30 +30518,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -31246,16 +31719,4 @@
 msgstr "空路"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "駅"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34174,17 +34635,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度分秒"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "アップロード用コメントを入力(最小3文字)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
-
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -34717,4 +35165,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "修正子 ID={0}"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度分秒"
 
 #~ msgid "Downloaded plugin information from {0} site"
@@ -34981,7 +35432,4 @@
 #~ msgid "Please choose a user using the author panel"
 #~ msgstr "著作者パネルを使用してユーザを選んでください。"
-
-#~ msgid "Continue anyway"
-#~ msgstr "とりあえず続ける"
 
 #~ msgid "Change the projection to {0} first."
@@ -35437,7 +35885,4 @@
 #~ "せん。"
 
-#~ msgid "Confirmation"
-#~ msgstr "確認"
-
 #~ msgid "Reached the end of the line"
 #~ msgstr "ラインの終端に到達"
@@ -35489,4 +35934,7 @@
 #~ "プを移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>"
 #~ "選択:</b> 左クリックしたままフレームをドロー。"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
 
 #~ msgid "Missing mandatory attribute ''{0}''"
@@ -35769,4 +36217,8 @@
 #~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
@@ -35833,4 +36285,7 @@
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "外部ヘルプブラウザの起動に失敗"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "アップロード用コメントを入力(最小3文字)"
 
 #~ msgid "Id > 0 required, got {0}"
@@ -35998,4 +36453,7 @@
 #~ msgid "Use all their elements"
 #~ msgstr "全て相手の要素を使う"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
 
 #~ msgid ""
