Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 16973)
+++ applications/editors/josm/i18n/po/ja.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:42+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:35+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "エラー"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -370,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -452,9 +452,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,7 +487,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -568,37 +568,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "データ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "レイヤ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -608,30 +608,30 @@
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "ズームする選択がありませｎ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "ウエイの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "複数のウエイを一つに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "異なるメンバーであるウェイを結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -641,13 +641,13 @@
 "か？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "強制的に連結。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "方向を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,10 +655,10 @@
 msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "逆転して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -666,20 +666,20 @@
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "ウェイが全て空です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -746,6 +746,6 @@
 msgstr "選択したオブジェクトを削除します"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -755,5 +755,5 @@
 msgstr "上書きする"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -885,7 +885,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "データをGPXファイルにエクスポートします。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -901,5 +900,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -917,5 +916,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -987,22 +986,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "ノードの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "一番古いものにノードをマージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "異なったメンバーになっているノードを結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1010,14 +1009,14 @@
 msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "強制的に結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1272,7 +1271,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "一つも開かれたデータがありませんんで、保存されません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1868,5 +1866,5 @@
 msgstr "ダウンロード中にエラーです。"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1878,5 +1876,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1915,11 +1913,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2058,5 +2056,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2132,5 +2130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "オブジェクトを検索する。"
@@ -2259,5 +2257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "検索"
@@ -2462,5 +2460,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2503,5 +2501,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "関連から削除"
@@ -2543,8 +2541,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0}ノードを結合する"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2580,8 +2579,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0}ノード"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2746,7 +2746,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "{0}このオブジェクトを変更"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2756,5 +2756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2799,5 +2799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2829,5 +2829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2840,5 +2840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "鉄道"
@@ -2853,5 +2853,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3134,5 +3134,5 @@
 msgstr "今後は表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3141,5 +3141,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3149,10 +3149,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3160,25 +3160,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3188,9 +3188,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3199,9 +3199,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "予期しない例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3211,9 +3223,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3223,5 +3235,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3311,10 +3323,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "パスワード"
@@ -3518,15 +3530,15 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3580,5 +3592,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3587,5 +3599,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3594,20 +3606,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3617,6 +3629,6 @@
 msgstr "タグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3624,6 +3636,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3631,40 +3643,40 @@
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3672,74 +3684,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3747,30 +3759,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3778,5 +3790,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3784,13 +3796,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3798,5 +3810,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3804,21 +3816,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3827,27 +3839,27 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3855,5 +3867,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3862,5 +3874,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3869,5 +3881,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3876,5 +3888,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3883,21 +3895,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3907,5 +3919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3915,5 +3927,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3921,19 +3933,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3942,19 +3954,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3963,9 +3975,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3975,13 +3987,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3989,90 +4001,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "削除された"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4082,17 +4094,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4101,14 +4113,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4116,21 +4128,21 @@
 msgstr "役割"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4138,14 +4150,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4153,7 +4165,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4165,7 +4177,7 @@
 msgstr "キー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4178,45 +4190,45 @@
 msgstr "値"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4236,8 +4248,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4274,5 +4286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4374,83 +4386,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "全ての読み込んだレイヤのリストを開きます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "選択したレイヤーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "レイヤー削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "選択したレイヤーの表示状態を切り替え"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -4460,6 +4472,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4467,22 +4479,22 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "空の値でキーを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4490,5 +4502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4496,40 +4508,40 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "選択されたオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4546,39 +4558,39 @@
 msgstr "追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "プロパティの削除"
@@ -4590,5 +4602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "リレーション"
@@ -4620,31 +4632,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "選択したエレメントのズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "選択したリストを更新する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4652,5 +4664,5 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4658,5 +4670,5 @@
 msgstr[0] "{0}ウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4664,5 +4676,5 @@
 msgstr[0] "{0} 関連"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4874,7 +4886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "選択したリレーションを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4957,5 +4968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5196,5 +5207,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "地名"
@@ -5241,21 +5252,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: 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:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "タイプ"
@@ -6055,72 +6066,512 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: 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:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java: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:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 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:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "名前"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} のイメージ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "GPXの読み込み…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "地点 {0} x {1}に時刻がありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0}を読み込んでいます ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "ジオタグのついた画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS開始: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS終了: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "現在の差分: {0} 秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "タイムゾーンの違い: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "トラック内に {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "時計の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEGイメージ(*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "ファイル \"{0}\"中の日付が取得できません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "時刻をGPSユニットと同期する"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "入力した時刻は、解釈できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "GPSポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "配色のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "既定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "色選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "名前のついた地点からのマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} からの名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "音声のインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} からの音声マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "イメージのインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} トラック "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0}ルート, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ウェイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "データレイヤーへ変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
+"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
+"てください："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "{0}からのコンバート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "このトラックに沿ってOSMからダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "次の範囲内の全てをダウンロード:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} メータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "リクエストあたりの最大面積："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方キロメートル"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
+"すか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "データーレイヤー {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "ダウンロード領域の外"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "バージョン {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0}は次からなります:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0}は削除されました)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "設定解除"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "APIバージョン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "GPXレイヤーの変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6129,7 +6580,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 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
@@ -6139,445 +6590,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "名前"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} のイメージ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "GPXの読み込み…"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "地点 {0} x {1}に時刻がありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "ジオタグのついた画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS開始: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS終了: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "現在の差分: {0} 秒"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "タイムゾーンの違い: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "トラック内に {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "時計の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEGイメージ(*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "ファイル \"{0}\"中の日付が取得できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "時刻をGPSユニットと同期する"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "入力した時刻は、解釈できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引く。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "配色のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "既定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "色選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "名前のついた地点からのマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} からの名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "音声のインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} からの音声マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "イメージのインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} トラック "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "データレイヤーへ変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
-"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
-"てください："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "{0}からのコンバート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "このトラックに沿ってOSMからダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "次の範囲内の全てをダウンロード:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} メータ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "リクエストあたりの最大面積："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方キロメートル"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
-"すか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
-"に変更又は移動されました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
-"外します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "データーレイヤー {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "ダウンロード領域の外"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "バージョン {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0}は次からなります:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0}は削除されました)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "設定解除"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "APIバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "GPXレイヤーの変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6958,5 +6969,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "自動車"
@@ -6973,16 +6984,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "自転車"
@@ -7010,14 +7023,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "徒歩"
@@ -7229,19 +7245,19 @@
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7370,35 +7386,11 @@
 msgstr "プロキシーのパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSMパスワード"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7754,7 +7746,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "\"{0}\"を読み込めません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7859,7 +7851,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "不明なロール\"{0}\"です。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8019,23 +8011,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "ログイン"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSMパスワード"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8198,14 +8214,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "{0}のメンバーのタイプが不明"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "III-形式のノードID"
@@ -8663,5 +8679,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "説明"
@@ -9079,5 +9095,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
@@ -9317,5 +9333,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9323,6 +9338,4 @@
 "projection and retry"
 msgstr ""
-"土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え"
-"て、再起動してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9411,5 +9424,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9949,7 +9962,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "水域(湖沼)"
@@ -10126,7 +10139,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "名前"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10686,12 +10698,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "開始"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0}ノード"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10829,5 +10841,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -11641,7 +11653,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:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "ビル"
@@ -11655,5 +11667,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "領域"
@@ -11886,17 +11898,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "編集する列を選択してください。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "レイヤー削除"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "ルーティングの開始"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -11905,7 +11914,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "アップロードする変更はありません。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11916,19 +11924,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11936,42 +11944,42 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
@@ -12314,4 +12322,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12348,5 +12358,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "ストリート"
@@ -12357,5 +12367,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速道路・有料道路"
@@ -12364,5 +12374,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "高速道路の編集"
@@ -12389,8 +12399,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "道路番号"
@@ -12431,21 +12441,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "レイヤー"
@@ -12459,8 +12469,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "車線数"
@@ -12478,15 +12488,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -12523,16 +12533,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "一方通行"
@@ -12574,19 +12584,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -12622,19 +12632,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "トンネル"
@@ -12668,18 +12678,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "切り通し"
@@ -12713,18 +12723,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "土手"
@@ -12732,5 +12742,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "高速道路の連絡路"
@@ -12739,5 +12749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "高速道路の連絡路の編集"
@@ -12745,5 +12755,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "国道"
@@ -12752,5 +12762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "国道の編集"
@@ -12760,6 +12770,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12767,5 +12777,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -12774,5 +12784,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -12785,5 +12795,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "都道府県道"
@@ -12792,5 +12802,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "都道府県道を編集"
@@ -12798,10 +12808,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "都道府県道の連絡路"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "都道府県道の連絡路の編集"
@@ -12813,5 +12823,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "主要道路"
@@ -12821,5 +12831,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "主要道路の編集"
@@ -12827,5 +12837,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "主要道路(Tertiary)"
@@ -12835,5 +12845,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "主要道路(Tertiary)の編集"
@@ -12845,5 +12855,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "１車線道"
@@ -12853,5 +12863,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "分類なし道路の編集"
@@ -12878,19 +12888,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -12902,5 +12912,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "敷地内道路"
@@ -12909,5 +12919,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "敷地内道路の編集"
@@ -12931,13 +12941,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "表面"
@@ -12957,20 +12967,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "未舗装"
@@ -12978,12 +12988,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "敷石"
@@ -12991,5 +13001,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "私道"
@@ -12998,5 +13008,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -13004,5 +13014,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "サービス"
@@ -13011,5 +13021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "サービス道路の編集"
@@ -13019,18 +13029,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "サービス路のタイプ"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -13038,5 +13048,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -13046,5 +13056,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -13052,5 +13062,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -13059,5 +13069,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -13066,20 +13076,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "料金"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -13092,8 +13102,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "アクセス"
@@ -13137,23 +13147,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "はい"
@@ -13166,40 +13176,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "私道"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "指定済み"
@@ -13212,19 +13222,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "行き先"
@@ -13247,65 +13257,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -13320,10 +13330,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "馬"
@@ -13339,13 +13349,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -13361,30 +13371,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "ボート"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -13392,25 +13402,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -13421,5 +13431,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -13441,9 +13451,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "タイプ"
@@ -13463,10 +13473,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "高速道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "高速道路のランプ"
@@ -13488,10 +13498,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -13513,10 +13523,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "都道府県道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "都道府県道の連絡路"
@@ -13538,6 +13548,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "主要道路"
@@ -13551,9 +13561,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "１車線道"
@@ -13567,9 +13577,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "私道"
@@ -13599,10 +13609,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "サービス"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -13610,4 +13620,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13625,6 +13642,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "工事中"
@@ -13635,10 +13652,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -13646,19 +13663,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "ウエイ"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "工事中"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "ジャンクション"
@@ -13674,5 +13691,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -13681,5 +13698,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "馬道"
@@ -13687,5 +13704,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -13693,5 +13710,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "自転車道"
@@ -13701,5 +13718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
@@ -13707,5 +13724,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "歩道"
@@ -13714,5 +13731,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "歩道の編集"
@@ -13720,5 +13737,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "ペデストリアン・歩行者用市街道路"
@@ -13727,5 +13744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "ペデストリアンデッキ、歩行者専用道路の編集"
@@ -13733,5 +13750,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "階段"
@@ -13741,5 +13758,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13748,5 +13765,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "トラック"
@@ -13755,14 +13772,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "砂利道"
@@ -13770,18 +13787,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "地表"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "砂地"
@@ -13789,5 +13806,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "トラック グレード 1"
@@ -13796,5 +13813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "トラック グレード 1　の編集"
@@ -13802,5 +13819,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "トラック グレード 2"
@@ -13809,5 +13826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "トラック グレード 2の編集"
@@ -13815,5 +13832,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "トラック グレード 3"
@@ -13822,5 +13839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "トラック グレード 3　の編集"
@@ -13828,5 +13845,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "トラック グレード 4"
@@ -13835,5 +13852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "トラック グレード 4　の編集"
@@ -13841,5 +13858,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "トラック グレード 5"
@@ -13848,5 +13865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "トラック グレード 5 の編集"
@@ -13855,5 +13872,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "小道"
@@ -13862,13 +13879,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "スノーモービル"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "スキー"
@@ -13876,5 +13893,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "ハイキング"
@@ -13884,5 +13901,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "ハイキングの編集"
@@ -13890,5 +13907,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "山岳ハイキング"
@@ -13898,5 +13915,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "山岳ハイキングの編集"
@@ -13904,5 +13921,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキング"
@@ -13912,5 +13929,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキングの編集"
@@ -13918,5 +13935,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "高山ハイキング"
@@ -13926,5 +13943,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "高山ハイキングの編集"
@@ -13932,5 +13949,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキング"
@@ -13940,5 +13957,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキングの編集"
@@ -13946,5 +13963,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "困難な高山ハイキング"
@@ -13954,5 +13971,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "困難な高山ハイキングの編集"
@@ -13960,10 +13977,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "高速道路のジャンクション"
@@ -13971,15 +13988,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "高速道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "サービス"
@@ -13987,5 +14004,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -14020,14 +14037,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "操作員"
@@ -14036,5 +14053,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -14044,5 +14061,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -14051,27 +14068,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -14079,6 +14096,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -14087,11 +14104,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -14099,30 +14116,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "停止"
@@ -14130,5 +14147,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -14137,14 +14154,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -14155,14 +14172,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "転回場"
@@ -14172,20 +14189,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -14193,5 +14210,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -14199,5 +14216,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "坂"
@@ -14205,5 +14222,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -14212,10 +14229,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -14223,5 +14240,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -14229,5 +14246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -14239,7 +14256,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "高度"
@@ -14247,5 +14264,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "ゲート等"
@@ -14253,5 +14270,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "車止め杭"
@@ -14259,5 +14276,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -14296,18 +14313,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -14316,5 +14337,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "ブロック"
@@ -14323,5 +14344,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -14329,5 +14350,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -14335,5 +14356,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -14341,15 +14362,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "料金所"
@@ -14357,5 +14378,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -14363,10 +14384,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -14376,5 +14397,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "生け垣"
@@ -14383,5 +14404,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "フェンス"
@@ -14390,5 +14411,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "壁"
@@ -14396,5 +14417,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "城壁"
@@ -14403,5 +14424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -14413,15 +14434,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "ゲート"
@@ -14429,50 +14450,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "踏み越し段"
@@ -14480,15 +14501,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "転車台（ターンテーブル）"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Stileの編集"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -14499,10 +14532,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "泉"
@@ -14510,5 +14543,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -14516,5 +14549,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "側溝"
@@ -14522,10 +14555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "小川"
@@ -14533,10 +14566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "運河"
@@ -14544,10 +14577,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "川"
@@ -14557,5 +14590,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:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "河川の編集"
@@ -14563,15 +14596,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -14579,5 +14612,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -14585,10 +14618,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "ため池"
@@ -14596,15 +14629,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -14612,5 +14645,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "川岸"
@@ -14619,10 +14652,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:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "湿地帯"
@@ -14633,14 +14666,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "湿地"
@@ -14654,35 +14687,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "砂浜"
@@ -14690,20 +14723,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "崖"
@@ -14711,10 +14744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "海岸線"
@@ -14722,5 +14755,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -14728,5 +14761,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -14734,5 +14767,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -14741,5 +14774,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "ボートヤード"
@@ -14747,10 +14780,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "船着き場の編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "ドック"
@@ -14758,5 +14791,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -14764,5 +14797,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "ダム"
@@ -14770,15 +14803,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -14787,5 +14820,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "堰"
@@ -14793,20 +14826,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "転回地点"
@@ -14815,15 +14848,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "桟橋"
@@ -14831,10 +14864,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -14842,10 +14875,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "造船台"
@@ -14855,5 +14888,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:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "造船台の編集"
@@ -14861,10 +14894,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "線路"
@@ -14872,5 +14905,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -14900,8 +14933,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -14915,35 +14948,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "モノレール"
@@ -14951,45 +14984,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -14997,5 +15030,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -15004,14 +15037,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -15020,5 +15053,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "踏切"
@@ -15027,5 +15060,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -15035,5 +15068,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -15041,5 +15074,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -15048,10 +15081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -15059,10 +15092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -15070,10 +15103,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -15081,10 +15114,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15092,5 +15125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15098,5 +15131,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "駅"
@@ -15107,10 +15140,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -15120,5 +15153,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:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -15134,5 +15167,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15142,5 +15175,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:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -15148,41 +15181,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "収容台数"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "パーク＆ライド"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "料金"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -15190,5 +15223,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -15196,15 +15229,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -15212,5 +15245,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "レンタル"
@@ -15219,10 +15252,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:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -15230,5 +15263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -15236,5 +15269,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
@@ -15243,5 +15276,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:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -15250,15 +15283,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:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15266,5 +15299,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "停車場"
@@ -15272,5 +15305,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -15278,5 +15311,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -15285,5 +15318,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:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -15291,5 +15324,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -15298,5 +15331,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:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -15308,5 +15341,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -15314,10 +15347,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -15326,10 +15359,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:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "車いす"
@@ -15338,5 +15371,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -15345,5 +15378,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:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -15351,5 +15384,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "バス停"
@@ -15359,5 +15392,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:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -15368,6 +15401,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "避難所"
@@ -15375,10 +15408,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -15386,5 +15419,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "タクシー"
@@ -15392,5 +15425,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -15398,5 +15431,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "空港"
@@ -15404,15 +15437,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15421,5 +15454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -15431,5 +15464,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -15438,15 +15471,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:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "モーテル"
@@ -15454,20 +15487,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -15475,10 +15508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "ホステル"
@@ -15486,30 +15519,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -15517,10 +15550,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -15531,5 +15564,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -15537,5 +15570,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -15543,5 +15576,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -15549,61 +15582,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -15611,9 +15644,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "カフェ"
@@ -15621,10 +15654,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -15632,20 +15665,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "バー"
@@ -15653,10 +15686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -15664,20 +15697,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
@@ -15686,11 +15719,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "博物館"
@@ -15698,10 +15731,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "動物園"
@@ -15710,10 +15743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -15721,25 +15754,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "美術館"
@@ -15747,5 +15780,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -15753,5 +15786,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "案内所"
@@ -15759,80 +15792,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "案内所の編集"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "マップタイプ"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "マップ"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "街路地図"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "ハイキングマップ"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "自転車マップ"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "board"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "ヒストリー"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "野生生物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "ガイドポスト(ハイキング)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -15840,25 +15873,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "城"
@@ -15867,20 +15900,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:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -15889,10 +15922,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "戦場"
@@ -15900,5 +15933,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "戦場の編集"
@@ -15906,15 +15939,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -15922,45 +15955,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "親水公園"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "親水公園の編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "遊び場"
@@ -15968,15 +16001,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "つりの編集"
@@ -15984,15 +16017,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -16006,6 +16039,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -16028,4 +16061,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16086,5 +16127,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16094,5 +16143,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16238,5 +16287,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16342,5 +16391,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16381,29 +16430,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "スポーツ"
@@ -16413,227 +16463,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "運動場"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -16672,191 +16722,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: 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:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: 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:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: 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:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "サイクリング"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "スキー"
@@ -16864,56 +16914,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "射撃"
@@ -16921,127 +16971,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "ペロタ"
@@ -17049,51 +17099,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "ビル"
@@ -17101,5 +17151,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "公共のビル"
@@ -17107,10 +17157,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "役場"
@@ -17118,10 +17168,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "大使館"
@@ -17129,10 +17179,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "裁判所"
@@ -17141,10 +17191,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:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "刑務所"
@@ -17153,10 +17203,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:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "警察"
@@ -17166,10 +17216,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:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "消防署"
@@ -17178,10 +17228,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:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "郵便局"
@@ -17189,5 +17239,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -17195,15 +17245,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "学校"
@@ -17211,10 +17261,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "大学"
@@ -17222,10 +17272,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "短大"
@@ -17233,5 +17283,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "短大の編集"
@@ -17239,5 +17289,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "映画館"
@@ -17246,10 +17296,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:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "図書館"
@@ -17258,10 +17308,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:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "美術館"
@@ -17269,10 +17319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "劇場"
@@ -17281,10 +17331,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:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -17294,5 +17344,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:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -17301,6 +17351,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "宗教"
@@ -17309,66 +17359,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "宗派"
@@ -17377,81 +17427,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "住所"
@@ -17460,5 +17510,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:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -17466,5 +17516,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "いえ番号"
@@ -17472,20 +17522,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "国コード"
@@ -17493,5 +17543,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -17500,5 +17550,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:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -17506,71 +17556,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "全て"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "灯台"
@@ -17578,10 +17628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "風車"
@@ -17589,10 +17639,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -17600,10 +17650,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -17613,10 +17663,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:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "クレーン"
@@ -17624,10 +17674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "ビーコン"
@@ -17635,10 +17685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -17646,10 +17696,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -17657,5 +17707,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -17663,5 +17713,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "発電機"
@@ -17671,39 +17721,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:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "変電所"
@@ -17712,10 +17762,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:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -17724,5 +17774,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:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -17730,10 +17780,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "送電塔"
@@ -17744,5 +17794,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:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -17750,5 +17800,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "送電線"
@@ -17757,25 +17807,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:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "トイレ"
@@ -17783,20 +17833,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "電話"
@@ -17805,5 +17855,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:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -17811,5 +17861,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "コイン"
@@ -17817,5 +17867,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "備考"
@@ -17823,5 +17873,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -17829,5 +17879,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -17835,15 +17885,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "リサイクル"
@@ -17852,5 +17902,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:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -17858,35 +17908,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "ベンチ"
@@ -17895,20 +17945,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "ロック"
@@ -17916,22 +17966,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "噴水"
@@ -17940,10 +17990,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:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -17952,10 +18002,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:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -17963,25 +18013,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -17989,10 +18039,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "キオスク"
@@ -18000,10 +18050,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -18011,5 +18061,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -18017,88 +18067,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "精肉店"
@@ -18106,10 +18156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "パン屋"
@@ -18117,10 +18167,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "生花店"
@@ -18128,20 +18178,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18149,60 +18199,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -18210,10 +18260,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "金物屋"
@@ -18221,10 +18271,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -18232,60 +18282,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -18293,10 +18343,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "ランドリー"
@@ -18304,10 +18354,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -18315,35 +18365,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "銀行"
@@ -18351,5 +18401,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "銀行の編集"
@@ -18357,10 +18407,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "両替"
@@ -18368,5 +18418,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -18374,15 +18424,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "医院"
@@ -18390,20 +18440,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "薬局"
@@ -18411,5 +18461,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -18417,10 +18467,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "病院"
@@ -18428,10 +18478,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -18440,5 +18490,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:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -18447,20 +18497,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -18468,5 +18518,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "動物病院"
@@ -18475,56 +18525,55 @@
 #. <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:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "郡の編集"
@@ -18532,15 +18581,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "町"
@@ -18548,10 +18597,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -18559,25 +18608,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -18585,5 +18634,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "地域"
@@ -18591,10 +18640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "島"
@@ -18602,5 +18651,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "島の編集"
@@ -18608,5 +18657,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -18614,10 +18663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "山頂"
@@ -18625,10 +18674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "氷河"
@@ -18636,10 +18685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "火山"
@@ -18647,70 +18696,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "樹木・林"
@@ -18719,15 +18768,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:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "森"
@@ -18736,5 +18785,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:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -18742,17 +18791,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "森"
@@ -18761,14 +18810,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -18776,25 +18825,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "低木林"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "山(Fell)"
@@ -18802,10 +18851,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "荒れ地"
@@ -18813,5 +18862,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -18819,5 +18868,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -18826,45 +18875,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -18872,25 +18921,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "里山"
@@ -18898,10 +18947,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "共有地"
@@ -18909,20 +18958,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -18930,5 +18979,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -18936,15 +18985,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "墓所"
@@ -18952,9 +19001,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -18962,39 +19011,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -19002,15 +19051,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "軍用"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -19018,55 +19067,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -19076,5 +19125,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:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -19083,10 +19132,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -19094,5 +19143,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -19101,5 +19150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -19107,34 +19156,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -19143,15 +19192,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "ウエイへ"
@@ -19159,5 +19208,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "ルート"
@@ -19166,5 +19215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -19172,5 +19221,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "ルート種類"
@@ -19242,24 +19291,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "自転車"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "スキー"
@@ -19312,20 +19361,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "徒歩"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "迂回路"
@@ -19339,10 +19388,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -19350,26 +19399,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "ネットワーク"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "ルート種類"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -19378,30 +19433,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -19437,6 +19492,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19452,5 +19508,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus havin 8 hex digits instead of 6).
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
 #.
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
@@ -19469,5 +19533,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "標準"
@@ -19561,7 +19625,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "橋"
@@ -19826,15 +19890,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "破棄された"
@@ -19876,5 +19940,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "馬"
@@ -20012,4 +20076,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.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"/>
@@ -20021,5 +20091,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20027,5 +20097,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20062,5 +20132,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20084,11 +20154,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20112,5 +20182,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20151,5 +20221,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20187,6 +20257,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "ストリート"
@@ -20242,7 +20312,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "車線"
@@ -20295,11 +20365,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. 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:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "線路"
@@ -20320,5 +20398,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20332,5 +20410,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20351,5 +20429,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "転回所"
@@ -20363,6 +20441,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20377,5 +20455,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "川岸"
@@ -20389,5 +20467,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "小川"
@@ -20401,5 +20479,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "ドック"
@@ -20427,5 +20505,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "水道"
@@ -20568,5 +20646,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20593,13 +20671,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "人工物"
@@ -20661,7 +20739,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20684,10 +20762,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20723,7 +20801,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "古い軌道"
@@ -20768,6 +20846,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "空路"
@@ -20781,5 +20859,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "駅"
@@ -20801,5 +20879,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -20813,5 +20891,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -20819,4 +20897,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20859,7 +20944,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "リフト"
@@ -20876,5 +20961,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -20889,5 +20974,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -20902,5 +20987,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -20915,5 +21000,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -20928,5 +21013,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -20941,5 +21026,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -20962,4 +21047,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20970,4 +21062,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21044,10 +21144,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "電力"
@@ -21061,5 +21162,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "桟橋"
@@ -21073,5 +21174,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "パイプライン"
@@ -21199,12 +21300,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "レジャー"
@@ -21218,5 +21319,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "マリーナ"
@@ -21288,8 +21389,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "アメニティ"
@@ -21391,10 +21492,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -21414,4 +21515,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21433,4 +21541,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21754,4 +21869,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21778,24 +21901,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 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:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: 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:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -21827,6 +21958,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "信号_水域"
@@ -21887,8 +22018,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "健康"
@@ -22241,26 +22372,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: 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
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "店"
@@ -22315,5 +22446,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22332,8 +22463,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "ホテル"
@@ -22483,9 +22614,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "旅行関係"
@@ -22557,8 +22688,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "史跡"
@@ -22629,8 +22760,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "緑"
@@ -22644,5 +22775,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "石切り場"
@@ -22656,5 +22787,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "埋め立て地"
@@ -22676,5 +22807,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -22688,5 +22819,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "森"
@@ -22700,5 +22831,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "農地"
@@ -22721,5 +22852,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "小売りの商用地"
@@ -22733,5 +22864,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "工業地"
@@ -22745,5 +22876,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -22757,5 +22888,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "緑地"
@@ -22769,5 +22900,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "鉄道公園"
@@ -22824,7 +22955,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "軍用地"
@@ -22838,5 +22969,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "墓地"
@@ -22849,5 +22980,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "山頂"
@@ -22862,5 +22993,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "氷河"
@@ -22874,5 +23005,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "火山"
@@ -22927,8 +23058,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "自然"
@@ -22942,5 +23073,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "低木"
@@ -22954,5 +23085,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "荒地"
@@ -22966,5 +23097,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "森"
@@ -22978,5 +23109,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "泥"
@@ -22990,5 +23121,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "砂浜"
@@ -23066,8 +23197,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: 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:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "ルート"
@@ -23115,7 +23246,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "行政区境"
@@ -23257,10 +23388,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "場所"
@@ -23308,6 +23439,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "住所"
@@ -23604,18 +23735,6 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "ファイルの拡張子が不明です"
-
 #~ msgid "Move"
 #~ msgstr "移動"
-
-#~ msgid "Invalid projection"
-#~ msgstr "投影法が無効"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "最初に投影法を {0} に変えてください。"
-
-#~ msgid "end"
-#~ msgstr "終了"
 
 #~ msgid "Data Layer"
@@ -23734,4 +23853,7 @@
 #~ msgstr "TCXファイルをインポート"
 
+#~ msgid "end"
+#~ msgstr "終了"
+
 #~ msgid "image not loaded"
 #~ msgstr "画像が読み込まれていません。"
@@ -23796,4 +23918,7 @@
 #~ msgid "resolved version:"
 #~ msgstr "解決したバージョン:"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "ファイルの拡張子が不明です"
 
 #~ msgid "Import TCX file as GPS track"
@@ -23950,4 +24075,10 @@
 #~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
 #~ "あなたの母国語</A>でそれを作成してください。"
+
+#~ msgid "Invalid projection"
+#~ msgstr "投影法が無効"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "最初に投影法を {0} に変えてください。"
 
 #~ msgid "Directly load TCX files from JOSM."
