Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 14372)
+++ applications/editors/josm/i18n/po/ja.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-27 20:55+0000\n"
-"Last-Translator: MAPconcierge <taichi@mapconcierge.jp>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-21 12:23+0000\n"
+"Last-Translator: nazotoko <shunw@ics.uci.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
@@ -36,39 +36,39 @@
 msgstr "投影法が設定から読み取れませんでした。EPSG:4326を使用します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "保存されていない変更があります。変更分を破棄して継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "保存して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "変更を破棄して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "キャンセル"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -405,6 +406,6 @@
 msgstr "逆転して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -412,20 +413,20 @@
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "ウェイが全て空です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -529,5 +530,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -648,6 +649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -656,6 +657,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -771,5 +772,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
 msgid "Merge nodes with different memberships?"
-msgstr ""
+msgstr "異なったメンバーになっているノードを結合しますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
@@ -783,10 +784,10 @@
 msgstr "強制的に結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -959,5 +960,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr ""
+msgstr "ほぼ垂直になっているウェイを選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
@@ -1062,5 +1063,5 @@
 msgstr "最新データを保存します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1070,26 +1071,26 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "一つも開かれたデータがありませんんで、保存されません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1099,32 +1100,32 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "OSMファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "ファイルをバックアップできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "ファイルの拡張子が不明です"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "保存中にエラー発生"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "バックアップファイルから復元するときに、エラーになりました。"
@@ -1181,23 +1182,23 @@
 msgstr "閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "ウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "選択したノードでウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "現在の選択は分割できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1210,15 +1211,15 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "選択したノードは同じウエイで共有されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "選択したウエイは選択したノードをつかって構成されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1226,5 +1227,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1234,11 +1235,14 @@
 "する）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
+"た。\n"
+"確認して、必要なら訂正してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1395,46 +1399,50 @@
 msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "アップロードする変更の概略コメントを入力してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "この変更をアップロードしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "アップロードするデータ"
@@ -1619,36 +1627,27 @@
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "新規ノードの作成"
-
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
@@ -1657,4 +1656,10 @@
 msgstr "カーソルの下のノードを選択"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "新規ノードを {0}このウエイに追加します。"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
@@ -1706,4 +1711,6 @@
 "+release to synchronize audio at that point."
 msgstr ""
+"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー"
+"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
@@ -1729,4 +1736,6 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
+"マージします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
@@ -1735,4 +1744,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
+"え);Shft-Ctrlで選択を回転。;選択を変更。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -1806,13 +1817,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr ""
+msgstr "<b>name:Bak</b> - 'Bak' その名前のどこか。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr ""
+msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
@@ -1860,5 +1871,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr ""
+msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
@@ -1883,10 +1894,10 @@
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -1914,4 +1925,8 @@
 "{2}"
 msgstr ""
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
+"セージは:\n"
+"\n"
+"{2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:361
@@ -2065,5 +2080,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2256,5 +2271,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "鉄道"
@@ -2275,127 +2290,127 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "領域を指定するウエイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "リレーションに登録すべきものがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "テキスト"
@@ -2403,5 +2418,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2428,5 +2443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "背景"
@@ -2493,5 +2508,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2505,5 +2520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2532,14 +2547,14 @@
 msgstr "解決したバージョン:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "今日のメッセージはありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- 起動中のバージョンは {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
@@ -2611,71 +2626,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "bounding boxをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 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:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "言語の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2683,23 +2698,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "アップデートしたプラグインの活性化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "プラグインのロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2877,5 +2897,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3084,5 +3104,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "役割"
@@ -3130,73 +3150,71 @@
 msgstr "プロパティ/メンバー"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "変更の適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "新規関連作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "新規関連編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "関連 #{0}の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "基本"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "次によって占められる;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "タグ（空の値でタグ自身を削除）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "上に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "選択したものを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "選択の削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "現在選択されている全てのオブジェクトを関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "下に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3205,36 +3223,36 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "この関連から現在の行のメンバーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "メンバー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "関連の編集者:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "インポート中に競合を発見しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "サーバからの応答内容が不正です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "サーバに接続できません。"
@@ -3248,10 +3266,11 @@
 msgstr "選択したリレーションを削除"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "リレーション"
@@ -3442,5 +3461,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "地名"
@@ -3487,21 +3506,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
 msgid "type"
 msgstr "タイプ"
@@ -3554,10 +3573,7 @@
 msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "マップ"
@@ -3710,4 +3726,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3811,5 +3828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3861,4 +3878,6 @@
 "the end were omitted or moved to the start."
 msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1024
@@ -3870,19 +3889,34 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は次からなります:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0}は削除されました)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "使用法"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3890,21 +3924,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
 msgid "track"
 msgid_plural "tracks"
@@ -3991,4 +4025,6 @@
 "track you were playing (after the first marker)."
 msgstr ""
+"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
+"グする必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
@@ -4334,5 +4370,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4417,4 +4453,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4498,7 +4536,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4511,7 +4546,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4527,10 +4569,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4699,5 +4741,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4731,7 +4775,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4815,4 +4859,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4865,4 +4917,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4871,7 +4929,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4880,15 +4935,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4913,129 +4957,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "名前"
@@ -5084,12 +5130,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "全てのタイルをロード"
+msgstr "ローカル・ファイル"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zone"
+msgstr "なし"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5116,45 +5160,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "自動車"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "自転車"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5162,25 +5196,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "徒歩"
@@ -5228,7 +5267,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "元gpsポイント間に線を描画"
+msgstr "GPS生データのポイント間にラインを引いて下さい"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5389,5 +5427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
 msgid "Download List"
-msgstr "ダウンロードリスト"
+msgstr "リストをダウンロードする"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
@@ -5841,10 +5879,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "データを準備中..."
@@ -5854,25 +5892,75 @@
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "変更セットを開いています…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "変更した設定を閉じています..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "アップロードする変更はありません。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "準備中..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "アップロード中..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "サーバからの応答内容が不正です。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "不明なホスト"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "ログイン"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5883,44 +5971,52 @@
 msgstr "パース中にエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "バージョン番号は不明です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "バージョン番号は不明です"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "ウエイ以外で<nd>要素が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> はゼロ参照です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>要素がリレーション以外に見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "必要な属性\"{0}\"がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "III-形式のノードID"
@@ -5930,10 +6026,10 @@
 msgstr "サーバに接続中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5943,55 +6039,8 @@
 "試してください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "アップロードする変更の概略コメントを入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "コメントを反映します"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "エラーが起こりました: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "変更セットを開いています…"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "サーバは変更した設定をサポートしていません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "不明なホスト"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "準備中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "アップロード中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "変更した設定を閉じています..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "エラーのため転送が中断しました（５秒待ちます）："
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6161,6 +6210,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "不明な"
@@ -6346,7 +6395,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "エリアの作成"
+msgstr "格子状のウェイの作成"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6358,14 +6406,13 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "共通のノードを持つ2つのウェイを選択してください"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "共通の1つだけのノードで、2つのウェイを選択してください。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "エリアの作成"
+msgstr "ウェイの格子を作る。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6389,5 +6436,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "説明"
@@ -6489,5 +6536,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "最適な等倍表示"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
@@ -6528,5 +6575,5 @@
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
+msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
@@ -6543,5 +6590,5 @@
 #, java-format
 msgid "Error while getting files from directory {0}\n"
-msgstr ""
+msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
@@ -6646,4 +6693,6 @@
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
+"<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。</"
+"html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
@@ -6669,5 +6718,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Correlate"
-msgstr ""
+msgstr "関連付け"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -6702,4 +6751,6 @@
 "Expected format: {0}"
 msgstr ""
+"オフセット区切り作業中にエラーです。\n"
+"期待されるフォーマット: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
@@ -6710,5 +6761,5 @@
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
+msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
@@ -6738,5 +6789,5 @@
 #, java-format
 msgid "Timezone: {0}"
-msgstr ""
+msgstr "タイムゾーン: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
@@ -6753,15 +6804,15 @@
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
+msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
 #, java-format
 msgid "(Time difference of {0} days)"
-msgstr ""
+msgstr "(時差 {0} 日)"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
+msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
@@ -6775,5 +6826,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
 msgid "Matching photos to track failed"
-msgstr ""
+msgstr "トラックへのフォトマッチに失敗しました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
@@ -6783,5 +6834,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Default Values"
-msgstr ""
+msgstr "デフォルトの値"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
@@ -6834,4 +6885,6 @@
 "Please check its availibility on www.cadastre.gouv.fr"
 msgstr ""
+"市/町/村 {0} はWMSに見つからないか、入手不可能です。\n"
+"入手可能かは、www.cadastre.gouv.fr で確認してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
@@ -6923,5 +6976,5 @@
 "Replace the original white background by the backgound color defined in JOSM "
 "preferences."
-msgstr ""
+msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
@@ -6964,5 +7017,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
+msgstr "このサイズを超えると古いファイルは自動的に削除されます"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
@@ -7016,5 +7069,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "都道府県界、市町村界の抽出"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -7025,5 +7078,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Extract building footprints"
-msgstr ""
+msgstr "建物のフットプリントの抽出"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
@@ -7148,5 +7201,5 @@
 #, java-format
 msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "都道府県 bbox: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
@@ -7399,4 +7452,7 @@
 "plugin/"
 msgstr ""
+"rxtxSerialライブラリ からロードすることができません。もし、それをインストール"
+"するためのサポートが必要であれば、Globalsat ホームページ（ http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
@@ -7641,7 +7697,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "湖沼・海洋"
@@ -7730,4 +7786,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
+"水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲に"
+"である．デフォルトは90。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -7748,9 +7806,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "東方向（°）にすべての点をオフセット。デフォルト 0"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "北方向(度)にあるすべてのポイントのオフセット. デフォルト 0."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -7760,5 +7818,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
+msgstr "水域、海岸線、土地、あるいは なし としてタグ付け。デフォルトは水域。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
@@ -7934,5 +7992,5 @@
 msgstr "OpenStreetBugs ダウンロード・ループ"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugsに報告された問題点を表示"
@@ -7949,4 +8007,11 @@
 msgstr "警告"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "エラーが起こりました: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7956,4 +8021,6 @@
 msgid "Header contains several values and cannot be mapped to a single string"
 msgstr ""
+"ヘッダが複数の値を含んでいるため、一つのストリングに描画することができませ"
+"ん。"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
@@ -7972,35 +8039,38 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "コメントの追加"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "コメントを入力してください"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "完了としてマーク"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "本当に閉じますか？"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "新規問題点"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "問題の作成"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "問題を詳細に記述してください"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "問題の作成"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8029,5 +8099,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8037,9 +8107,9 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarenderオプション"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -8111,129 +8181,113 @@
 "た。:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "ナビゲーション"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "ルーティング"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "何もしない"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "クリックしてルートノードの追加"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "クリックして新規ノードを挿入します。"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "クリックとドラッグでルートノードの移動"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "クリックして新規ノードを挿入します。"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "クリックしてルートノードの追加"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "ルーティングノードのリストを開く"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "重複したノードの削除中…"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "全てのリレーションのリストを開く"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "駅"
+msgid "Add routing layer"
+msgstr "新規レイヤーを作成"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "中級"
+msgstr "基準/条件"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "靴店"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "最短"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "もっと速く"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "最速"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "テラスを反転"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "フェリー航路"
+msgstr "ルートの消去"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "WMSプラグイン設定"
+msgstr "ルーティング プラグインの設定"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "プラグインサイトを設定"
+msgstr "ルーティング設定情報の構成"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "道路の出口"
+msgstr "ハイウェイ タイプ"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "最高速度（km/h）"
+msgstr "速度 (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "高さ"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "重みの値の入力"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "タイルの状態を表示"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "要求の更新"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "画像が読み込まれていません。"
@@ -8256,34 +8310,34 @@
 msgstr "スリッピマップ プラグイン用設定"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "タイルソース"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "自動ズーム: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "タイルの自動読み込み "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "最大ズーム lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Fade background: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "メタデータの読み込みエラー"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "要求: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "アップデート要求時にエラー"
@@ -8298,5 +8352,5 @@
 msgstr "１分ごとに取得したデータをファイルに保存します。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8351,7 +8405,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "州(state)の編集"
+msgstr "タグの編集"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8359,64 +8412,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "タグ編集ダイアログの開始"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM タグ編集プラグイン"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "なし"
+msgstr "(なし)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "ハイライト"
+msgstr "強調"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "多目的"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "{0}このオブジェクトのプロパティーの変更"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "{0}このオブジェクトのプロパティーの変更"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "ルート"
+msgstr "グループ"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "小川"
+msgstr "アイテム"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "検索"
+msgstr "検索: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "ファイル"
+msgstr "フィルタ"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "自動車"
+msgstr "クリア"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8467,5 +8514,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
 msgid "Creates individual buildings from a long building."
-msgstr ""
+msgstr "長い建物から個別の建物を生成"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
@@ -8500,5 +8547,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -8563,5 +8610,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
-msgstr ""
+msgstr "現在最大2つまでのエリアのみ結合できます。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
@@ -8593,5 +8640,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "すべての交差点にノードを追加"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
@@ -8600,17 +8647,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "関連"
+msgstr "リレーションの修正"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "オーバーラップ領域を接続する。"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "オーバーラップ領域を接続する。"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8621,12 +8665,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "競合点の統合"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "関連から削除"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8635,17 +8677,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "閉じていないウェイ"
+msgstr "閉じたウェイ"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "レイヤーから写真を削除しますか？"
+msgstr "内部のウェイからタグを削除"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "高速道路のジャンクション"
+msgstr "エリア結合機能"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -8655,5 +8694,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
+msgstr "特定の場所へジャンプできるダイアログを開始"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
@@ -8745,5 +8784,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use the ignore list to suppress warnings."
-msgstr ""
+msgstr "警告を抑制するために、無視するリストを使用する"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
@@ -8884,5 +8923,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "このテストは海岸線が正しいことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
@@ -8911,5 +8950,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
@@ -8932,5 +8971,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
 msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr ""
+msgstr "このテストは同じ名前のノードを探します（重複の可能性）。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
@@ -8990,5 +9029,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
+msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
@@ -8998,5 +9037,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
 msgid "This plugin checks for errors in property keys and values."
-msgstr ""
+msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
@@ -9231,4 +9270,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9310,7 +9355,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "ビル"
@@ -9324,5 +9369,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "領域"
@@ -9342,9 +9387,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
 msgid "Way end node near other highway"
-msgstr ""
+msgstr "ウエイは他の高速道路の近くでノードで終わっています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
 msgid "Way end node near other way"
-msgstr ""
+msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
@@ -9465,4 +9510,5 @@
 msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
+"Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
@@ -9493,10 +9539,10 @@
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr ""
+msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
@@ -9504,4 +9550,5 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
+"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
@@ -9515,5 +9562,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
 msgid "Reload erroneous tiles"
-msgstr ""
+msgstr "誤ったタイルのリロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
@@ -9527,5 +9574,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:145
 msgid "Open a blank WMS layer to load data from a file"
-msgstr ""
+msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
@@ -9590,8 +9637,15 @@
 "request a smaller area, or use planet.osm"
 msgstr ""
+"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
+"るか、planet.osm を使用して下さい。"
 
 #. OSM server message
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
+msgstr "入力したURLからは音声入力ストリームを取得できません"
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
 msgstr ""
 
@@ -9620,7 +9674,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "エリアの作成"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9630,4 +9683,6 @@
 "openstreetmap.org."
 msgstr ""
+"このプラグインは現在アクティブなJOSMレイヤのGPSトラックをopenstreetmap.orgへ"
+"直接アップロードします。"
 
 #. Plugin Duplicate-Way
@@ -9647,5 +9702,5 @@
 #: build/trans_plugins.java:17
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
+msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
 #. Plugin grid
@@ -9692,5 +9747,5 @@
 #: build/trans_plugins.java:31
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
@@ -9711,21 +9766,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9734,15 +9796,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
+msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9752,15 +9814,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "直接JOSMからのTCXファイルをロードしてください。"
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9769,5 +9831,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9776,5 +9838,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9783,5 +9845,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9871,5 +9933,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "道路番号"
@@ -9924,7 +9986,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "レイヤー"
@@ -9967,5 +10029,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -10013,5 +10075,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "一方通行"
@@ -10067,5 +10129,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -10115,5 +10177,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "トンネル"
@@ -10160,5 +10222,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "切り通し"
@@ -10205,5 +10267,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "土手"
@@ -10361,6 +10423,6 @@
 #: build/trans_presets.java:674 build/trans_presets.java:687
 #: build/trans_presets.java:700 build/trans_presets.java:713
-#: build/trans_presets.java:726 build/trans_presets.java:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -10409,5 +10471,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "表面"
@@ -10439,5 +10501,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "舗装"
@@ -10448,5 +10510,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "未舗装"
@@ -10460,5 +10522,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "敷石"
@@ -10505,5 +10567,5 @@
 #: build/trans_presets.java:257
 msgid "driveway"
-msgstr ""
+msgstr "私道"
 
 #: build/trans_presets.java:257
@@ -10610,5 +10672,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10629,6 +10691,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "はい"
@@ -10678,5 +10740,5 @@
 #: build/trans_presets.java:637
 msgid "designated"
-msgstr ""
+msgstr "指定済み"
 
 #. color private
@@ -10752,5 +10814,5 @@
 #: build/trans_presets.java:619
 msgid "agricultural"
-msgstr ""
+msgstr "農業の"
 
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10772,7 +10834,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "いいえ"
@@ -10786,73 +10848,63 @@
 msgstr "大型車"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "馬"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "バイク"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "自動車"
@@ -10927,130 +10979,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "タイプ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11058,5 +10998,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11064,11 +11004,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11076,5 +11010,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11082,5 +11016,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11088,5 +11022,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11094,6 +11028,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11112,6 +11052,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "高速道路"
@@ -11137,6 +11077,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "国道"
@@ -11162,6 +11102,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "都道府県道"
@@ -11187,6 +11127,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "主要道路"
@@ -11200,5 +11140,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "敷地内道路"
@@ -11216,5 +11156,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "敷地内道路"
@@ -11232,5 +11172,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "サービス"
@@ -11257,6 +11197,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "工事中"
@@ -11297,6 +11237,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11307,5 +11246,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -11396,5 +11335,5 @@
 #: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "gravel"
-msgstr ""
+msgstr "砂利道"
 
 #: build/trans_presets.java:510 build/trans_presets.java:531
@@ -11420,5 +11359,5 @@
 #: build/trans_presets.java:518
 msgid "Track Grade 1"
-msgstr ""
+msgstr "トラック グレード 1"
 
 #. item
@@ -11427,5 +11366,5 @@
 #: build/trans_presets.java:521
 msgid "Edit Track of grade 1"
-msgstr ""
+msgstr "トラック グレード 1　の編集"
 
 #. item "Ways/Track Grade 1" text "Width (meters)"
@@ -11433,5 +11372,5 @@
 #: build/trans_presets.java:539
 msgid "Track Grade 2"
-msgstr ""
+msgstr "トラック グレード 2"
 
 #. item
@@ -11440,5 +11379,5 @@
 #: build/trans_presets.java:542
 msgid "Edit Track of grade 2"
-msgstr ""
+msgstr "トラック グレード 2の編集"
 
 #. item "Ways/Track Grade 2" text "Width (meters)"
@@ -11446,5 +11385,5 @@
 #: build/trans_presets.java:560
 msgid "Track Grade 3"
-msgstr ""
+msgstr "トラック グレード 3"
 
 #. item
@@ -11453,5 +11392,5 @@
 #: build/trans_presets.java:563
 msgid "Edit Track of grade 3"
-msgstr ""
+msgstr "トラック グレード 3　の編集"
 
 #. item "Ways/Track Grade 3" text "Width (meters)"
@@ -11459,5 +11398,5 @@
 #: build/trans_presets.java:581
 msgid "Track Grade 4"
-msgstr ""
+msgstr "トラック グレード 4"
 
 #. item
@@ -11466,5 +11405,5 @@
 #: build/trans_presets.java:584
 msgid "Edit Track of grade 4"
-msgstr ""
+msgstr "トラック グレード 4　の編集"
 
 #. item "Ways/Track Grade 4" text "Width (meters)"
@@ -11472,5 +11411,5 @@
 #: build/trans_presets.java:602
 msgid "Track Grade 5"
-msgstr ""
+msgstr "トラック グレード 5"
 
 #. item
@@ -11479,5 +11418,5 @@
 #: build/trans_presets.java:605
 msgid "Edit Track of grade 5"
-msgstr ""
+msgstr "トラック グレード 5 の編集"
 
 #. item "Ways/Track Grade 5" text "Width (meters)"
@@ -11515,5 +11454,5 @@
 #: build/trans_presets.java:655
 msgid "Edit Hiking"
-msgstr "ハイキング"
+msgstr "ハイキングの編集"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -11529,5 +11468,5 @@
 #: build/trans_presets.java:668
 msgid "Edit Mountain Hiking"
-msgstr "山岳ハイキング"
+msgstr "山岳ハイキングの編集"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -11535,5 +11474,5 @@
 #: build/trans_presets.java:677
 msgid "Demanding Mountain Hiking"
-msgstr "Demanding Mountain Hiking"
+msgstr "厳しい山岳ハイキング"
 
 #. item
@@ -11543,5 +11482,5 @@
 #: build/trans_presets.java:681
 msgid "Edit Demanding Mountain Hiking"
-msgstr "Demanding Mountain Hikingの編集"
+msgstr "厳しい山岳ハイキングの編集"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -11557,5 +11496,5 @@
 #: build/trans_presets.java:694
 msgid "Edit Alpine Hiking"
-msgstr "高山ハイキング"
+msgstr "高山ハイキングの編集"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -11563,5 +11502,5 @@
 #: build/trans_presets.java:703
 msgid "Demanding Alpine Hiking"
-msgstr "Demanding Alpine Hiking"
+msgstr "厳しい高山ハイキング"
 
 #. item
@@ -11571,5 +11510,5 @@
 #: build/trans_presets.java:707
 msgid "Edit Demanding Alpine Hiking"
-msgstr "Demanding Alpine Hikingの編集"
+msgstr "厳しい高山ハイキングの編集"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -11577,5 +11516,5 @@
 #: build/trans_presets.java:716
 msgid "Difficult Alpine Hiking"
-msgstr "Difficult Alpine Hiking"
+msgstr "困難な高山ハイキング"
 
 #. item
@@ -11585,5 +11524,5 @@
 #: build/trans_presets.java:720
 msgid "Edit Difficult Alpine Hiking"
-msgstr "Difficult Alpine Hikingの編集"
+msgstr "困難な高山ハイキングの編集"
 
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
@@ -11649,14 +11588,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "操作員"
@@ -11681,20 +11620,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "マークだけ"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "信号機"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "途中に島あり"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "マークなし"
@@ -11702,5 +11641,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "馬の背で横断"
@@ -11709,5 +11648,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11717,5 +11656,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "踏切係員"
@@ -11768,5 +11707,5 @@
 #: build/trans_presets.java:767
 msgid "Edit Crossing"
-msgstr ""
+msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
@@ -11830,5 +11769,5 @@
 #: build/trans_presets.java:801
 msgid "Incline"
-msgstr ""
+msgstr "坂"
 
 #. item
@@ -11836,5 +11775,5 @@
 #: build/trans_presets.java:804
 msgid "Incline Steep"
-msgstr ""
+msgstr "急な坂"
 
 #. item
@@ -11864,10 +11803,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "高度"
@@ -11880,29 +11820,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "踏み越し段"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Stileの編集"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "車止め杭"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "bollardの編集"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11911,7 +11840,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11920,240 +11852,225 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "ブロック"
+
+# http://en.wikipedia.org/wiki/Cattle_grid
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Cattle Grid(家畜用格子柵)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Cattle Gridの編集"
+
+# http://en.wikipedia.org/wiki/Bus_trap
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "バスだけが通行可能になる落とし穴"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "料金所"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "料金所の編集"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "国境検査所"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "国境検査所の編集"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "生け垣"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "フェンス"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "壁"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "城壁"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "擁壁"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "入口"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "入り口の編集"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "ゲート"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "ゲートの編集"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "引き上げゲート"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "引き上げゲートの編集"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Hampshire Gate"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Hampshire Gateの編集"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "竹のゲート"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "竹のゲートの編集"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
-msgstr "Kissing Gateの編集"
+msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Hampshire Gate"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Hampshire Gateの編集"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "車止め杭"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "bollardの編集"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "跳ね橋"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "跳ね橋の編集"
-
-# http://en.wikipedia.org/wiki/Bus_trap
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "バスだけが通行可能になる落とし穴"
-
-# http://en.wikipedia.org/wiki/Cattle_grid
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Cattle Grid(家畜用格子柵)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Cattle Gridの編集"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-# http://en.wikipedia.org/wiki/Portcullis
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "城の格子戸"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "ゲート"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "門の編集"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr ""
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "踏み越し段"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Stileの編集"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "竹のゲート"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "竹のゲートの編集"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "生け垣"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "フェンス"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "壁"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "料金所"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "料金所の編集"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "国境検査所"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "国境検査所の編集"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "入口"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "湖沼・海洋"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "泉"
@@ -12161,5 +12078,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -12167,5 +12084,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "側溝"
@@ -12173,10 +12090,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "小川"
@@ -12184,10 +12101,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "運河"
@@ -12195,10 +12112,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "川"
@@ -12208,5 +12125,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "河川の編集"
@@ -12214,15 +12131,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "湖沼・海洋の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -12230,5 +12147,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -12236,10 +12153,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "ため池"
@@ -12247,15 +12164,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -12263,5 +12180,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "川岸"
@@ -12270,10 +12187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "湿地帯"
@@ -12284,56 +12201,56 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "湿地"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "海岸"
@@ -12341,20 +12258,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "海岸の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "崖"
@@ -12362,10 +12279,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "海岸線"
@@ -12373,5 +12290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -12379,5 +12296,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -12385,5 +12302,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -12392,5 +12309,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "ボートヤード"
@@ -12398,10 +12315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "船着き場の編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "ドック"
@@ -12409,5 +12326,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -12415,5 +12332,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "ダム"
@@ -12421,15 +12338,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -12438,5 +12355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "堰"
@@ -12444,20 +12361,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "転回地点"
@@ -12466,15 +12383,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "桟橋"
@@ -12482,10 +12399,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -12493,10 +12410,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "造船台"
@@ -12506,5 +12423,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "造船台の編集"
@@ -12512,10 +12429,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "線路"
@@ -12523,5 +12440,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -12551,8 +12468,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -12566,35 +12483,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "モノレール"
@@ -12602,45 +12519,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -12648,5 +12565,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -12655,14 +12572,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -12671,5 +12588,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "踏切"
@@ -12678,5 +12595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -12686,11 +12603,11 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
-msgstr ""
+msgstr "踏切のタイプ"
 
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -12699,10 +12616,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -12710,10 +12627,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -12721,10 +12638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -12732,24 +12649,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "ゴルフの編集"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "駅"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -12759,5 +12689,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -12773,5 +12703,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12781,5 +12711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -12787,40 +12717,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
-msgstr ""
+msgstr "収容台数"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
-msgstr ""
-
-#: build/trans_presets.java:1370
+msgstr "多階の建物"
+
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "パーク＆ライド"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "料金"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -12828,5 +12759,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -12834,15 +12765,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -12850,5 +12781,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "レンタル"
@@ -12857,10 +12788,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -12868,5 +12799,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -12874,5 +12805,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
@@ -12881,5 +12812,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -12888,15 +12819,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -12904,5 +12835,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "停車場"
@@ -12910,5 +12841,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -12916,5 +12847,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -12923,5 +12854,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -12929,5 +12860,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -12936,5 +12867,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -12946,16 +12877,16 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
-msgstr ""
+msgstr "リファレンス (ホームの番号)"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -12964,10 +12895,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "車いす"
@@ -12976,5 +12907,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -12983,5 +12914,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -12989,5 +12920,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "バス停"
@@ -12997,5 +12928,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -13003,10 +12934,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -13014,5 +12945,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "タクシー"
@@ -13020,5 +12951,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -13026,5 +12957,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "空港"
@@ -13032,15 +12963,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
-msgstr ""
+msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13049,5 +12980,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -13059,5 +12990,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -13066,15 +12997,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "モーテル"
@@ -13082,20 +13013,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -13103,10 +13034,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "ホステル"
@@ -13114,30 +13045,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -13145,10 +13076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -13159,5 +13090,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -13165,5 +13096,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -13171,5 +13102,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -13177,61 +13108,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -13239,9 +13170,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "カフェ"
@@ -13249,10 +13180,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -13260,31 +13191,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
-msgstr ""
+msgstr "バー"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
-msgstr ""
+msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -13292,20 +13223,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
@@ -13314,11 +13245,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "博物館"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "博物館の編集"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "動物園"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+#: build/trans_presets.java:1639
+msgid "Edit Zoo"
+msgstr "動物園の編集"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "観覧台"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "View pointの編集"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Look-Out Tower"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "テーマパーク"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "テーマパークの編集"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "美術館"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "美術館の編集"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "案内所"
@@ -13326,143 +13318,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "博物館"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "博物館の編集"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "動物園"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "動物園の編集"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "観覧台"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "View pointの編集"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Look-Out Tower"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "テーマパーク"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "テーマパークの編集"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "美術館"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "美術館の編集"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+msgstr "案内所の編集"
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "マップタイプ"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "マップ"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "街路地図"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "ハイキングマップ"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "自転車マップ"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "情報板"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "board"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "ヒストリー"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "自然"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "野生生物"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "ガイドポスト(ハイキング)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "マップタイプ"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "マップ"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "街路地図"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "ハイキングマップ"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "自転車マップ"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "board"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "ヒストリー"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "自然"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "野生生物"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
-msgstr ""
+msgstr "その他の情報ポイント"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "避難所"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -13470,25 +13402,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "キャンプ場"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "キャンプ場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "城"
@@ -13497,20 +13429,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -13519,20 +13451,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "戦場"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "戦場の編集"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -13540,56 +13484,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "戦場"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "戦場の編集"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1758
+msgstr "道祖神"
+
+#. item
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "親水公園"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "親水公園の編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "遊び場"
@@ -13597,15 +13530,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "つりの編集"
@@ -13613,15 +13546,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -13635,6 +13568,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -13713,4 +13646,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14002,28 +13943,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "スポーツ"
@@ -14033,227 +13975,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "ピッチ"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "ピッチの編集"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -14292,191 +14234,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
 msgid "pitch"
 msgstr "ピッチ"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "サイクリング"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "スキー"
@@ -14484,56 +14426,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "上級"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "射撃"
@@ -14541,127 +14485,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "ペロタ"
@@ -14669,51 +14613,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "ビル"
@@ -14721,5 +14665,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "公共のビル"
@@ -14727,10 +14671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "役場"
@@ -14738,10 +14682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "大使館"
@@ -14749,10 +14693,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "裁判所"
@@ -14761,10 +14705,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "刑務所"
@@ -14773,10 +14717,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "警察"
@@ -14786,10 +14730,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "消防署"
@@ -14798,10 +14742,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "郵便局"
@@ -14809,5 +14753,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -14815,15 +14759,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "学校"
@@ -14831,10 +14775,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "大学"
@@ -14842,10 +14786,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "短大"
@@ -14853,5 +14797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "短大の編集"
@@ -14859,5 +14803,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "映画館"
@@ -14866,10 +14810,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "図書館"
@@ -14878,10 +14822,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "美術館"
@@ -14889,10 +14833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "劇場"
@@ -14901,10 +14845,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -14914,5 +14858,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -14921,6 +14865,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "地域"
@@ -14929,66 +14873,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "宗派"
@@ -14997,81 +14942,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "住所"
@@ -15080,5 +15025,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -15086,5 +15031,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "いえ番号"
@@ -15092,20 +15037,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "国コード"
@@ -15113,5 +15058,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -15120,5 +15065,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -15126,67 +15071,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "全て"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "アスレチック"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "灯台"
@@ -15194,10 +15144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "風車"
@@ -15205,10 +15155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -15216,10 +15166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -15229,10 +15179,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "クレーン"
@@ -15240,10 +15190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "ビーコン"
@@ -15251,10 +15201,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -15262,10 +15212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -15273,5 +15223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -15279,5 +15229,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "発電機"
@@ -15287,39 +15237,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "水力発電"
+
+#: build/trans_presets.java:2260
 msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "火力発電"
+
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "太陽光発電"
+
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "変電所"
@@ -15328,10 +15278,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -15340,5 +15290,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -15346,10 +15296,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "送電塔"
@@ -15360,5 +15310,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -15366,5 +15316,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "送電線"
@@ -15373,25 +15323,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "トイレ"
@@ -15399,25 +15349,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "参照番号"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "料金"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "電話"
@@ -15426,5 +15371,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -15432,5 +15377,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "コイン"
@@ -15438,5 +15383,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "備考"
@@ -15444,5 +15389,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -15450,5 +15395,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -15456,15 +15401,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "リサイクル"
@@ -15473,5 +15418,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -15479,35 +15424,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "ベンチ"
@@ -15516,20 +15461,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "ロック"
@@ -15537,22 +15482,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "噴水"
@@ -15561,10 +15506,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -15573,10 +15518,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -15584,25 +15529,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -15610,10 +15555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "キオスク"
@@ -15621,10 +15566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -15632,5 +15577,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -15638,88 +15583,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "精肉店"
@@ -15727,10 +15672,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "パン屋"
@@ -15738,10 +15683,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "生花店"
@@ -15749,70 +15694,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "学校"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "靴店の編集"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "飲料店の編集"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -15820,10 +15779,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "金物屋"
@@ -15831,10 +15790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -15842,60 +15801,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -15903,10 +15862,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "ランドリー"
@@ -15914,10 +15873,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -15925,35 +15884,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "スポーツ店"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "スポーツ"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "眼鏡屋"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "銀行"
@@ -15961,5 +15922,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "銀行の編集"
@@ -15967,10 +15928,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "両替"
@@ -15978,5 +15939,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -15984,15 +15945,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "医院"
@@ -16000,20 +15961,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "薬局"
@@ -16021,5 +15982,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -16027,10 +15988,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "病院"
@@ -16038,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -16050,5 +16011,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -16057,20 +16018,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
-msgstr ""
+msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -16078,5 +16039,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "動物病院"
@@ -16085,25 +16046,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "国(country)の編集"
@@ -16111,45 +16072,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "郡の編集"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "町"
@@ -16157,10 +16119,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -16168,30 +16130,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "地域"
@@ -16199,10 +16162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "島"
@@ -16210,5 +16173,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "島の編集"
@@ -16216,5 +16179,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -16222,10 +16185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "山頂"
@@ -16233,10 +16196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "氷河"
@@ -16244,10 +16207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "火山"
@@ -16255,70 +16218,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "樹木・林"
@@ -16327,15 +16290,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "森"
@@ -16344,5 +16307,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -16350,17 +16313,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "森"
@@ -16369,19 +16332,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "ガレ場"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "ガレ場の編集"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "低木林"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "低木林の編集"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "山(Fell)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "山(Fell)の編集"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "荒れ地"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "荒れ地の編集"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -16390,70 +16397,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "里山"
@@ -16461,5 +16469,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
@@ -16468,5 +16476,5 @@
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "共有地"
@@ -16474,20 +16482,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -16495,5 +16503,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -16501,15 +16509,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "墓所"
@@ -16517,9 +16525,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -16527,39 +16535,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -16567,114 +16575,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "軍用"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "軍用地の編集"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "工事中エリア"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "工事中用地の編集"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "工事中エリア"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "工事中用地の編集"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "軍用"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "軍用地の編集"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "ガレ場"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "ガレ場の編集"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "低木林"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "低木林の編集"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "山(Fell)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "山(Fell)の編集"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "荒れ地"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "荒れ地の編集"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -16684,5 +16649,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -16691,10 +16656,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -16702,5 +16667,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -16709,5 +16674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -16715,34 +16680,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -16751,15 +16716,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "ウエイへ"
@@ -16767,5 +16732,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "ルート"
@@ -16774,5 +16739,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -16780,5 +16745,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "ルート種類"
@@ -16850,24 +16815,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "自転車"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "スキー"
@@ -16912,4 +16877,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16919,21 +16887,22 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "徒歩"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
-msgstr ""
+msgstr "迂回路"
 
 #. color otherrail
@@ -16945,10 +16914,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -16956,26 +16925,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
-msgstr ""
-
-#: build/trans_presets.java:2989
+msgstr "案"
+
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -16984,30 +16953,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
-msgstr ""
+msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
-msgstr ""
+msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17191,4 +17160,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17200,4 +17276,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17299,11 +17384,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "破棄された"
@@ -17345,7 +17432,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "馬"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="fence"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "ゲート等"
 
 #. color tertiary
@@ -17381,6 +17683,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "ストリート"
@@ -17436,7 +17738,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "車線"
@@ -17483,108 +17785,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#: build/trans_style.java:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "線路"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "高架橋"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17601,4 +17816,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "サービス"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17608,4 +17829,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "浅瀬（洗い越し）"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17622,8 +17849,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "転回所"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "夜間急病センター"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17635,5 +17876,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "川岸"
@@ -17647,5 +17888,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "小川"
@@ -17659,5 +17900,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "ドック"
@@ -17685,5 +17926,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "水道"
@@ -17698,4 +17939,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17735,5 +17977,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17850,12 +18092,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "人工物"
@@ -17901,5 +18144,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17917,7 +18160,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17940,10 +18183,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
-msgstr ""
+msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17973,8 +18216,8 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
-msgstr ""
+msgstr "古い軌道"
 
 #. color rail
@@ -18017,6 +18260,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "空路"
@@ -18030,5 +18273,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "駅"
@@ -18050,5 +18293,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -18062,5 +18305,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -18083,4 +18326,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18100,4 +18351,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "リフト"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18106,23 +18363,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "リフト"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -18136,5 +18380,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -18148,5 +18393,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -18159,6 +18405,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "フリースタイルのゲレンデ"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -18172,5 +18433,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -18201,4 +18463,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18233,4 +18503,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18243,8 +18537,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "電力"
@@ -18257,5 +18553,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "桟橋"
@@ -18269,5 +18568,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "パイプライン"
@@ -18395,12 +18694,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "レジャー"
@@ -18414,5 +18713,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "マリーナ"
@@ -18484,10 +18783,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
-msgstr ""
+msgstr "アメニティ"
 
 #. color amenity
@@ -18521,4 +18820,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18578,11 +18885,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -18721,6 +19028,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18947,22 +19275,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -18994,6 +19322,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "信号_水域"
@@ -19029,4 +19357,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19046,7 +19382,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "健康"
@@ -19140,4 +19477,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19340,4 +19685,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19371,28 +19732,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 build/trans_style.java:2200
-#: build/trans_style.java:2208 build/trans_style.java:2216
-#: build/trans_style.java:2224 build/trans_style.java:2232
-#: build/trans_style.java:2240 build/trans_style.java:2248
-#: build/trans_style.java:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "店"
@@ -19446,4 +19809,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19456,8 +19827,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
 msgid "hotel"
 msgstr "ホテル"
@@ -19512,4 +19883,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19606,9 +19978,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "旅行関係"
@@ -19680,8 +20052,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "史跡"
@@ -19751,9 +20123,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "緑"
@@ -19767,5 +20139,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "石切り場"
@@ -19779,5 +20151,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "埋め立て地"
@@ -19799,5 +20171,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -19811,5 +20183,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "森"
@@ -19823,5 +20195,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "農地"
@@ -19844,5 +20216,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "小売りの商用地"
@@ -19856,5 +20228,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "工業地"
@@ -19868,5 +20240,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -19880,5 +20252,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "緑地"
@@ -19892,7 +20264,7 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
-msgstr ""
+msgstr "鉄道公園"
 
 #. color construction
@@ -19947,7 +20319,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "軍用地"
@@ -19961,5 +20333,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "墓地"
@@ -19972,5 +20344,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "頂上"
@@ -19985,5 +20357,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "氷河"
@@ -19997,5 +20369,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "火山"
@@ -20010,4 +20382,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20049,7 +20422,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "自然"
@@ -20063,5 +20437,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "低木"
@@ -20075,5 +20449,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "荒地"
@@ -20087,5 +20461,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "森"
@@ -20099,5 +20473,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "泥"
@@ -20111,5 +20485,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "ビーチ"
@@ -20187,8 +20561,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "ルート"
@@ -20236,7 +20610,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "行政区画"
@@ -20378,10 +20752,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "場所"
@@ -20422,6 +20796,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "住所"
@@ -20561,5 +20942,5 @@
 #: build/trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "ノード上の誤った高速道路タグ"
 
 #. node : W : highway == track
@@ -20703,135 +21084,54 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "これを選択すると、gpsデバイスが線を引かない場合、ウェイに沿って線を描画す"
-#~ "る。"
-
-#~ msgid "Reset Graph"
-#~ msgstr "グラフリセット"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "競合リストからどれか選択してください。"
-
-#~ msgid "Please select a color."
-#~ msgstr "色を選択してください"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "フルスクリーン・モードで起動しない"
-
-#~ msgid "News about JOSM"
-#~ msgstr "JOSMに関するニュース"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "クリックして既存のノードとつなぎます。"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "このトレースのアップロード…"
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>この機能は最近追加されたばかりです。<br>注意して利用し、期待したよう"
-#~ "に動いているか確認してください</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "JOSMによってフィルターされたトラックをアップロード"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "生ファイルのアップロード: "
-
-#~ msgid "Description:"
-#~ msgstr "記述:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "タグ（GPX中のキーワード）:"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-アップロード"
-
-#~ msgid "time"
-#~ msgstr "時刻"
-
-#~ msgid "desc"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "開く..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
 #~ msgstr "説明"
 
-#~ msgid "symbol"
-#~ msgstr "シンボル"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "生ファイル {0}のアップロード"
-
-#~ msgid "Tags:"
-#~ msgstr "タグ:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "地点の速度によって、軌跡の色彩を変える配色を行う。"
-
-#~ msgid "Edit an Exit"
-#~ msgstr "出口の編集"
-
-#~ msgid "Exit Number"
-#~ msgstr "出口番号"
-
-#~ msgid "Exit Name"
-#~ msgstr "出口の名前"
-
-#~ msgid "Information point"
-#~ msgstr "観光案内所"
-
-#~ msgid "political"
-#~ msgstr "political境界"
-
-#~ msgid "National_park"
-#~ msgstr "国立公園の境界"
-
-#~ msgid "Add Site"
-#~ msgstr "サイトの追加"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "サイトの削除"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "削除するサイトを選択してください。"
-
-#~ msgid "Check Site(s)"
-#~ msgstr "サイトのチェック"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "新しいプラグインサイトを追加。"
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "一覧から選択したサイトを削除する。"
-
-#~ msgid "Update Sites"
-#~ msgstr "サイトのアップデート"
-
-#~ msgid "Version"
-#~ msgstr "バージョン"
-
-#~ msgid "Install"
-#~ msgstr "インストール"
-
-#~ msgid "Signpost"
-#~ msgstr "道路案内標識"
-
-#~ msgid "office"
-#~ msgstr "オフィス"
-
-#~ msgid "guidepost"
-#~ msgstr "道しるべ"
-
-#~ msgid "Update Site URL"
-#~ msgstr "サイトのURLをアップデート"
-
-#~ msgid "Invalid URL"
-#~ msgstr "不正なURL"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "\"{0}\"ウェイは少なくとも2ノードからなる必要があります。"
-
-#~ msgid "Upload GPX track"
-#~ msgstr "gpsトラックのアップロード"
+#~ msgid "Commit comment"
+#~ msgstr "コメントを反映します"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "サーバは変更した設定をサポートしていません"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "エラーのため転送が中断しました（５秒待ちます）："
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
+
+#~ msgid "Navigation"
+#~ msgstr "ナビゲーション"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "ルートノードの削除"
+
+#~ msgid "Start routing"
+#~ msgstr "ルーティングの開始"
+
+# http://en.wikipedia.org/wiki/Draw_bridge
+#~ msgid "Drawbridge"
+#~ msgstr "跳ね橋"
+
+# http://en.wikipedia.org/wiki/Draw_bridge
+#~ msgid "Edit Drawbridge"
+#~ msgstr "跳ね橋の編集"
+
+# http://en.wikipedia.org/wiki/Portcullis
+#~ msgid "Portcullis"
+#~ msgstr "城の格子戸"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "城の格子戸の編集"
+
+#~ msgid "Charge"
+#~ msgstr "料金"
+
+#~ msgid "sports"
+#~ msgstr "スポーツ店"
+
+#~ msgid "viaduct"
+#~ msgstr "高架橋"
