Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 23004)
+++ applications/editors/josm/i18n/po/ja.po	(revision 23107)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 22:59+0200\n"
-"PO-Revision-Date: 2010-09-02 21:58+0000\n"
+"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"PO-Revision-Date: 2010-09-06 00:23+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-09-05 20:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -57,11 +57,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:444
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -73,7 +73,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:698
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
@@ -157,8 +157,8 @@
 msgstr "バグ報告"
 
-#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
+#. <button label="Info" hotkey="I">
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -257,6 +258,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
@@ -280,9 +281,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
@@ -304,5 +306,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "キャンセル"
@@ -395,4 +397,5 @@
 msgstr "選択したノードを円形に移動します"
 
+#. $NON-NLS-1$
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
@@ -416,5 +419,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
@@ -430,5 +433,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -672,6 +675,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -812,5 +815,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
 msgid "Duplicate"
 msgstr "複製"
@@ -846,8 +849,8 @@
 msgstr "{0} の{1} をコピー"
 
-#. <button label="Info" hotkey="I">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="Exit" hotkey="E">
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:24
@@ -1560,6 +1563,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1570,9 +1573,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:698
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1104
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1112
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1357
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -1623,4 +1626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1733,4 +1737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
 msgid "Close"
 msgstr "閉じる"
@@ -1782,4 +1787,5 @@
 msgstr "簡略化には、少なくとも1つのウェイを選択してください。"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1787,4 +1793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
+#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "はい"
@@ -1839,10 +1846,10 @@
 msgstr "選択したノードは同じウェイで共有されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:131
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1855,11 +1862,11 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:262
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1869,5 +1876,5 @@
 "する）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:448
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:443
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1877,5 +1884,5 @@
 "した。<br>これらを確認して必要なら訂正してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1885,5 +1892,5 @@
 "らを確認して必要なら訂正してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3039,9 +3046,10 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -3051,5 +3059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:323
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
@@ -3066,5 +3074,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58
+#: build/specialmessages.java:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3166,5 +3174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
 msgid "Double conflict"
 msgstr "二重の競合"
@@ -4091,5 +4099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "railway"
 msgstr "鉄道"
@@ -4122,5 +4130,4 @@
 msgstr "公共輸送機関"
 
-#. color tiger_data
 #. </rule>
 #.
@@ -4175,4 +4182,5 @@
 #. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#. color building
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
@@ -4530,5 +4538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1067
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -4756,5 +4764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4862,5 +4870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
@@ -4878,5 +4886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:313
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -5305,6 +5313,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5320,6 +5328,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5399,5 +5407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
@@ -5413,5 +5421,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "all"
 msgstr "全て"
@@ -5703,5 +5711,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5800,5 +5808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -6053,9 +6061,9 @@
 msgstr "レイヤーについての情報"
 
-#. item "Annotation/Contact" text "Image"
+#. group "Relations"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3532
+#: build/trans_presets.java:3558
 msgid "Relations"
 msgstr "リレーション"
@@ -6078,5 +6086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1432
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
@@ -6149,15 +6157,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
@@ -6503,32 +6511,32 @@
 
 #. Strings in JFileChooser
-#. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
-#. item "Highways/Streets/Trunk" text "Reference"
+#. item "Highways/Streets/Motorway" text "Name"
 #. <optional>
-#. item "Highways/Streets/Primary" text "Reference"
+#. item "Highways/Streets/Trunk" text "Name"
 #. <optional>
-#. item "Highways/Streets/Secondary" text "Reference"
+#. item "Highways/Streets/Primary" text "Name"
 #. <optional>
-#. item "Highways/Streets/Tertiary" text "Reference"
+#. item "Highways/Streets/Secondary" text "Name"
 #. <optional>
-#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
+#. item "Highways/Streets/Tertiary" text "Name"
 #. <space />
 #. <key key="highway" value="unclassified" />
 #. <optional>
-#. item "Highways/Streets/Residential" label "Edit Residential Street"
+#. item "Highways/Streets/Unclassified" text "Name"
 #. <space />
 #. <key key="highway" value="residential" />
-#. item "Highways/Streets/Living Street" label "Edit Living Street"
+#. item "Highways/Streets/Residential" text "Name"
 #. <space />
 #. <key key="highway" value="living_street" />
-#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. item "Highways/Streets/Living Street" text "Name"
 #. <space />
 #. <key key="highway" value="pedestrian" />
-#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. item "Highways/Streets/Service" text "Name"
 #. <space />
 #. <key key="highway" value="road" />
 #. <optional>
-#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
@@ -6536,9 +6544,11 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Highways/Streets/Bridge" label "Edit Bridge"
+#. item "Highways/Streets/Construction" text "Name"
+#. <optional>
+#. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
 #. <key key="bridge" value="yes" />
 #. <optional>
-#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
+#. item "Highways/Streets/Bridge" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -6547,21 +6557,21 @@
 #. <key key="tunnel" value="yes" />
 #. <optional>
-#. item "Ways/Track" label "Edit Track"
+#. item "Highways/Streets/Tunnel" text "Name"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Path" label "Edit Path"
+#. item "Ways/Track" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
 #. <optional>
-#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. item "Ways/Path" text "Name"
 #. <space />
 #. <key key="highway" value="bridleway" />
 #. <optional>
-#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. item "Ways/Dedicated Bridleway" text "Name"
 #. <space />
 #. <key key="highway" value="cycleway" />
 #. <optional>
-#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
+#. item "Ways/Dedicated Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
@@ -6570,5 +6580,5 @@
 #. <key key="segregated" value="yes" />
 #. <optional>
-#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
@@ -6577,667 +6587,673 @@
 #. <key key="segregated" value="no" />
 #. <optional>
-#. item "Ways/Dedicated Footway" label "Edit Footway"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Steps" label "Edit Flight of Steps"
+#. item "Ways/Dedicated Footway" text "Name"
 #. <space />
 #. <key key="highway" value="steps" />
 #. <optional>
-#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
+#. item "Ways/Steps" text "Name"
 #. <space />
 #. <key key="highway" value="motorway_junction" />
-#. item "Waypoints/Services" label "Edit Service Station"
+#. item "Waypoints/Motorway Junction" text "Name"
 #. <space />
 #. <key key="highway" value="services" />
 #. <optional>
-#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. item "Waypoints/Services" text "Name"
 #. <space />
 #. <key key="highway" value="rest_area" />
 #. <optional>
-#. item "Waypoints/City Limit" label "Edit City Limit Sign"
+#. item "Waypoints/Rest Area" text "Name"
 #. <space />
 #. <key key="traffic_sign" value="city_limit" />
 #. <space />
-#. item "Waypoints/Ford" label "Edit Ford"
+#. item "Waypoints/City Limit" text "Name"
 #. <space />
 #. <key key="highway" value="ford" />
 #. <optional>
-#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
+#. item "Waypoints/Ford" text "Name"
 #. <space />
 #. <key key="mountain_pass" value="yes" />
 #. <optional>
-#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#. item "Waypoints/Mountain Pass" text "Name"
 #. <space />
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Drain" label "Edit Drain"
+#. item "Barriers/Toll Booth" text "Name"
 #. <space />
 #. <key key="waterway" value="drain" />
-#. item "Water/Water/Ditch" label "Edit Ditch"
+#. item "Water/Water/Drain" text "Name"
 #. <space />
 #. <key key="waterway" value="ditch" />
-#. item "Water/Water/Stream" label "Edit Stream"
+#. item "Water/Water/Ditch" text "Name"
 #. <space />
 #. <key key="waterway" value="stream" />
-#. item "Water/Water/Canal" label "Edit Canal"
+#. item "Water/Water/Stream" text "Name"
 #. <space />
 #. <key key="waterway" value="canal" />
-#. item "Water/Water/River" label "Edit River"
+#. item "Water/Water/Canal" text "Name"
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Spring" label "Edit Spring"
+#. item "Water/Water/River" text "Name"
 #. <key key="natural" value="spring" />
-#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. item "Water/Water/Spring" text "Name"
 #. <space />
 #. <key key="waterway" value="waterfall" />
-#. item "Water/Water/Weir" label "Edit Weir"
+#. item "Water/Water/Waterfall" text "Name"
 #. <space />
 #. <key key="waterway" value="weir" />
-#. item "Water/Water/Dam" label "Edit Dam"
+#. item "Water/Water/Weir" text "Name"
 #. <space />
 #. <key key="waterway" value="dam" />
-#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#. item "Water/Water/Dam" text "Name"
 #. <space />
 #. <key key="landuse" value="basin" />
-#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#. item "Water/Water/Basin" text "Name"
 #. <space />
 #. <key key="landuse" value="reservoir" />
-#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. item "Water/Water/Reservoir" text "Name"
 #. <key key="man_made" value="reservoir_covered" />
-#. item "Water/Water/Water" label "Edit Water"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
+#. item "Water/Water/Water" text "Name"
 #. <key key="natural" value="land" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
+#. item "Water/Water/Land" text "Name"
 #. <key key="natural" value="coastline" />
-#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#. item "Water/Water/Coastline" text "Name"
 #. <key key="waterway" value="riverbank" />
-#. item "Water/Water/Wetland" label "Edit Wetland"
+#. item "Water/Water/Riverbank" text "Name"
 #. <key key="natural" value="wetland" />
-#. item "Water/Water/Mud" label "Edit Mud"
+#. item "Water/Water/Wetland" text "Name"
 #. <key key="natural" value="mud" />
-#. item "Water/Water/Beach" label "Edit Beach"
+#. item "Water/Water/Mud" text "Name"
 #. <key key="natural" value="beach" />
-#. item "Water/Water/Bay" label "Edit Bay"
+#. item "Water/Water/Beach" text "Name"
 #. <key key="natural" value="bay" />
-#. item "Water/Water/Cliff" label "Edit Cliff"
+#. item "Water/Water/Bay" text "Name"
 #. <key key="natural" value="cliff" />
-#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. item "Water/Water/Cliff" text "Name"
 #. <key key="amenity" value="ferry_terminal" />
-#. item "Shipping/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" text "Name"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Shipping/Marina" label "Edit Marina"
+#. item "Shipping/Ferry Route" text "Name"
 #. <key key="leisure" value="marina" />
-#. item "Shipping/Pier" label "Edit Pier"
+#. item "Shipping/Marina" text "Name"
 #. <key key="man_made" value="pier" />
-#. item "Shipping/Slipway" label "Edit Slipway"
+#. item "Shipping/Pier" text "Name"
 #. <key key="leisure" value="slipway" />
-#. item "Shipping/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Slipway" text "Name"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Shipping/Dock" label "Edit Dock"
+#. item "Shipping/Boatyard" text "Name"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#. item "Shipping/Dock" text "Name"
 #. <space />
 #. <key key="highway" value="bus_guideway" />
 #. <optional>
-#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#. item "Transport/Railway/Bus Guideway" text "Name"
 #. <key key="aerialway" value="chair_lift" />
-#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#. item "Aerialway/Chair Lift" text "Name"
 #. <key key="aerialway" value="drag_lift" />
-#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#. item "Aerialway/Drag Lift" text "Name"
 #. <key key="aerialway" value="cable_car" />
-#. item "Aerialway/Gondola" label "Edit Gondola"
+#. item "Aerialway/Cable Car" text "Name"
 #. <key key="aerialway" value="gondola" />
-#. item "Aerialway/Station" label "Edit Station"
+#. item "Aerialway/Gondola" text "Name"
 #. <key key="aerialway" value="station" />
-#. item "Aerialway/Pylon" label "Edit Pylon"
+#. item "Aerialway/Station" text "Name"
 #. <key key="aerialway" value="pylon" />
-#. item "Aerialway/Goods" label "Edit Goods"
+#. item "Aerialway/Pylon" text "Name"
 #. <key key="aerialway" value="goods" />
+#. item "Aerialway/Goods" text "Name"
 #. <optional>
-#. item "Car/Parking" label "Edit Parking"
+#. item "Car/Fuel" text "Name"
 #. <key key="amenity" value="parking" />
-#. item "Car/Wash" label "Edit Car Wash"
+#. item "Car/Parking" text "Name"
 #. <key key="amenity" value="car_wash" />
-#. item "Car/Car Dealer" label "Edit Car Shop"
+#. item "Car/Wash" text "Name"
 #. <key key="shop" value="car" />
-#. item "Car/Repair" label "Edit Car Repair"
+#. item "Car/Car Dealer" text "Name"
 #. <key key="shop" value="car_repair" />
-#. item "Car/Tyres" label "Edit Tyres"
+#. item "Car/Repair" text "Name"
 #. <key key="shop" value="tyres" />
-#. item "Car/Rental" label "Edit Car Rental"
+#. item "Car/Tyres" text "Name"
 #. <key key="amenity" value="car_rental" />
-#. item "Car/Sharing" label "Edit Car Sharing"
+#. item "Car/Rental" text "Name"
 #. <key key="amenity" value="car_sharing" />
-#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
-#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. item "Motorcycle/Parking" text "Name"
 #. <key key="shop" value="motorcycle" />
-#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
 #. <key key="amenity" value="bicycle_parking" />
-#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. item "Bicycle/Parking" text "Name"
 #. <key key="shop" value="bicycle" />
-#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#. item "Bicycle/Bike Dealer" text "Name"
 #. <key key="amenity" value="bicycle_rental" />
-#. item "Public Transport/Station" label "Edit Station"
+#. item "Bicycle/Rental" text "Name"
 #. <space />
 #. <key key="railway" value="station" />
 #. <optional>
-#. item "Public Transport/Railway Halt" label "Edit Halt"
+#. item "Public Transport/Station" text "Name"
 #. <space />
 #. <key key="railway" value="halt" />
 #. <optional>
-#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#. item "Public Transport/Railway Halt" text "Name"
 #. <space />
 #. <key key="railway" value="tram_stop" />
 #. <optional>
-#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#. item "Public Transport/Tram Stop" text "Name"
 #. <space />
 #. <key key="railway" value="subway_entrance" />
 #. <optional>
-#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#. item "Public Transport/Subway Entrance" text "Name"
 #. <key key="amenity" value="bus_station" />
 #. <optional>
-#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#. item "Public Transport/Bus Station" text "Name"
 #. <space />
 #. <key key="highway" value="bus_stop" />
 #. <optional>
-#. item "Public Transport/Taxi" label "Edit Taxi station"
+#. item "Public Transport/Bus Stop" text "Name"
 #. <key key="amenity" value="taxi" />
-#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#. item "Public Transport/Taxi" text "Name"
 #. <key key="aeroway" value="aerodrome" />
-#. item "Airport/Terminal" label "Edit Terminal"
+#. item "Airport/Airport Ground" text "Name"
 #. <key key="aeroway" value="terminal" />
-#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#. item "Airport/Terminal" text "Name"
 #. <key key="tourism" value="hotel" />
-#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#. item "Travel/Accomodation/Hotel" text "Name"
 #. <key key="tourism" value="motel" />
-#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#. item "Travel/Accomodation/Motel" text "Name"
 #. <key key="tourism" value="guest_house" />
-#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#. item "Travel/Accomodation/Guest House" text "Name"
 #. <key key="tourism" value="chalet" />
-#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#. item "Travel/Accomodation/Chalet" text "Name"
 #. <key key="tourism" value="hostel" />
-#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. item "Travel/Accomodation/Hostel" text "Name"
 #. <key key="tourism" value="alpine_hut" />
-#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
 #. <key key="tourism" value="caravan_site" />
-#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
 #. <key key="tourism" value="camp_site" />
-#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#. item "Travel/Accomodation/Camping Site" text "Name"
 #. <key key="amenity" value="restaurant" />
-#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#. item "Food+Drinks/Restaurant" text "Name"
 #. <key key="amenity" value="fast_food" />
-#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. item "Food+Drinks/Fast Food" text "Name"
 #. <key key="amenity" value="food_court" />
-#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#. item "Food+Drinks/Food Court" text "Name"
 #. <key key="amenity" value="cafe" />
-#. item "Food+Drinks/Pub" label "Edit Pub"
+#. item "Food+Drinks/Cafe" text "Name"
 #. <key key="amenity" value="pub" />
-#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#. item "Food+Drinks/Pub" text "Name"
 #. <key key="amenity" value="biergarten" />
-#. item "Food+Drinks/Bar" label "Edit Bar"
+#. item "Food+Drinks/Biergarten" text "Name"
 #. <key key="amenity" value="bar" />
-#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#. item "Food+Drinks/Bar" text "Name"
 #. <key key="amenity" value="nightclub" />
-#. item "Tourism/Attraction" label "Edit Attraction"
+#. item "Food+Drinks/Nightclub" text "Name"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Museum" label "Edit Museum"
+#. item "Tourism/Attraction" text "Name"
 #. <key key="tourism" value="museum" />
-#. item "Tourism/Zoo" label "Edit Zoo"
+#. item "Tourism/Museum" text "Name"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Theme Park" label "Edit Theme Park"
+#. item "Tourism/Zoo" text "Name"
 #. <key key="tourism" value="theme_park" />
-#. item "Tourism/Artwork" label "Edit Artwork"
+#. item "Tourism/Theme Park" text "Name"
 #. <key key="tourism" value="artwork" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. item "Tourism/Artwork" text "Name"
 #. <key key="tourism" value="viewpoint" />
-#. item "Tourism/Shelter" label "Edit Shelter"
+#. item "Tourism/Viewpoint" text "Name"
 #. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. item "Tourism/Shelter" text "Name"
 #. <key key="tourism" value="picnic_site" />
-#. item "Tourism/Information Office"
+#. item "Tourism/Picnic Site" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="office" />
-#. item "Tourism/Map"
+#. item "Tourism/Information Office" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="map" />
-#. item "Tourism/Information Board"
+#. item "Tourism/Map" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="board" />
-#. item "Tourism/Guidepost"
+#. item "Tourism/Information Board" text "Name"
 #. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="guidepost" />
-#. item "Tourism/Information Terminal"
+#. item "Tourism/Guidepost" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="terminal" />
-#. item "Tourism/Audioguide"
+#. item "Tourism/Information Terminal" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="audioguide" />
-#. item "Tourism/Other Information Points"
+#. item "Tourism/Audioguide" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Historic Places/Castle" label "Edit Castle"
+#. item "Tourism/Other Information Points" text "Name"
 #. <key key="historic" value="castle" />
-#. item "Historic Places/Ruins" label "Edit Ruins"
+#. item "Historic Places/Castle" text "Name"
 #. <key key="historic" value="ruins" />
-#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#. item "Historic Places/Ruins" text "Name"
 #. <key key="historic" value="archaeological_site" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. item "Historic Places/Archaeological Site" text "Name"
 #. <key key="historic" value="battlefield" />
-#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#. item "Historic Places/Battlefield" text "Name"
 #. <key key="geological" value="palaeontological_site" />
-#. item "Historic Places/Monument" label "Edit Monument"
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <key key="historic" value="monument" />
-#. item "Historic Places/Memorial" label "Edit Memorial"
+#. item "Historic Places/Monument" text "Name"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#. item "Historic Places/Memorial" text "Name"
 #. <key key="historic" value="wayside_cross" />
-#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#. item "Historic Places/Wayside Cross" text "Name"
 #. <key key="historic" value="wayside_shrine" />
-#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. item "Historic Places/Wayside Shrine" text "Name"
 #. <key key="historic" value="boundary_stone" />
-#. item "Leisure/Water Park" label "Edit Water Park"
+#. item "Historic Places/Boundary Stone" text "Name"
 #. <key key="leisure" value="water_park" />
-#. item "Leisure/Playground" label "Edit Playground"
+#. item "Leisure/Water Park" text "Name"
 #. <key key="leisure" value="playground" />
-#. item "Leisure/Fishing" label "Edit Fishing"
+#. item "Leisure/Playground" text "Name"
 #. <key key="leisure" value="fishing" />
-#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#. item "Leisure/Fishing" text "Name"
 #. <key key="leisure" value="stadium" />
-#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <key key="leisure" value="sports_centre" />
-#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
 #. <key key="leisure" value="pitch" />
-#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#. item "Sports/Sport Facilities/Pitch" text "Name"
 #. <key key="leisure" value="track" />
-#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <key key="leisure" value="golf_course" />
-#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. item "Sports/Sport Facilities/Golf Course" text "Name"
 #. <key key="leisure" value="miniature_golf" />
-#. item "Sport/Multi" label "Edit Multi"
+#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. <key key="sport" value="multi" />
-#. item "Sport/10pin" label "Edit 10pin"
+#. item "Sport/Multi" text "Name"
 #. <key key="sport" value="10pin" />
-#. item "Sport/Athletics" label "Edit Athletics"
+#. item "Sport/10pin" text "Name"
 #. <key key="sport" value="athletics" />
-#. item "Sport/Archery" label "Edit Archery"
+#. item "Sport/Athletics" text "Name"
 #. <key key="sport" value="archery" />
-#. item "Sport/Climbing" label "Edit Climbing"
+#. item "Sport/Archery" text "Name"
 #. <key key="sport" value="climbing" />
-#. item "Sport/Canoeing" label "Edit Canoeing"
+#. item "Sport/Climbing" text "Name"
 #. <key key="sport" value="canoe" />
-#. item "Sport/Cycling" label "Edit Cycling"
+#. item "Sport/Canoeing" text "Name"
 #. <key key="sport" value="cycling" />
-#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#. item "Sport/Cycling" text "Name"
 #. <key key="sport" value="dog_racing" />
-#. item "Sport/Equestrian" label "Edit Equestrian"
+#. item "Sport/Dog Racing" text "Name"
 #. <key key="sport" value="equestrian" />
-#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#. item "Sport/Equestrian" text "Name"
 #. <key key="sport" value="horse_racing" />
-#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#. item "Sport/Horse Racing" text "Name"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Skating" label "Edit Skating"
+#. item "Sport/Gymnastics" text "Name"
 #. <key key="sport" value="skating" />
-#. item "Sport/Skateboard" label "Edit Skateboard"
+#. item "Sport/Skating" text "Name"
 #. <key key="sport" value="skateboard" />
-#. item "Sport/Swimming" label "Edit Swimming"
+#. item "Sport/Skateboard" text "Name"
 #. <key key="sport" value="swimming" />
-#. item "Sport/Skiing" label "Edit Skiing"
+#. item "Sport/Swimming" text "Name"
 #. <key key="sport" value="skiing" />
-#. item "Sport/Shooting" label "Edit Shooting"
+#. item "Sport/Skiing" text "Name"
 #. <key key="sport" value="shooting" />
-#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#. item "Sport/Shooting" text "Name"
 #. <key key="sport" value="soccer" />
-#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#. item "Sport (Ball)/Soccer" text "Name"
 #. <key key="sport" value="australian_football" />
-#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. item "Sport (Ball)/Australian Football" text "Name"
 #. <key key="sport" value="american_football" />
-#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. item "Sport (Ball)/American Football" text "Name"
 #. <key key="sport" value="canadian_football" />
-#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. item "Sport (Ball)/Canadian Football" text "Name"
 #. <key key="sport" value="gaelic_football" />
-#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
 #. <key key="sport" value="rugby_league" />
-#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. item "Sport (Ball)/Rugby League" text "Name"
 #. <key key="sport" value="rugby_union" />
-#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#. item "Sport (Ball)/Rugby Union" text "Name"
 #. <key key="sport" value="baseball" />
-#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#. item "Sport (Ball)/Baseball" text "Name"
 #. <key key="sport" value="basketball" />
-#. item "Sport (Ball)/Golf" label "Edit Golf"
+#. item "Sport (Ball)/Basketball" text "Name"
 #. <key key="sport" value="golf" />
-#. item "Sport (Ball)/Boule" label "Edit Boule"
+#. item "Sport (Ball)/Golf" text "Name"
 #. <key key="sport" value="boules" />
-#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#. item "Sport (Ball)/Boule" text "Name"
 #. <key key="sport" value="bowls" />
-#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#. item "Sport (Ball)/Bowls" text "Name"
 #. <key key="sport" value="cricket" />
-#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#. item "Sport (Ball)/Cricket" text "Name"
 #. <key key="sport" value="cricket_nets" />
-#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
 #. <key key="sport" value="croquet" />
-#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#. item "Sport (Ball)/Croquet" text "Name"
 #. <key key="sport" value="hockey" />
-#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#. item "Sport (Ball)/Hockey" text "Name"
 #. <key key="sport" value="pelota" />
-#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#. item "Sport (Ball)/Pelota" text "Name"
 #. <key key="sport" value="racquet" />
-#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#. item "Sport (Ball)/Racquet" text "Name"
 #. <key key="sport" value="table_tennis" />
-#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#. item "Sport (Ball)/Table Tennis" text "Name"
 #. <key key="sport" value="tennis" />
-#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. item "Sport (Ball)/Tennis" text "Name"
 #. <key key="sport" value="motor" />
-#. item "Motorsport/Karting" label "Edit Karting"
+#. item "Motorsport/Motorsport" text "Name"
 #. <key key="sport" value="karting" />
-#. item "Motorsport/Motocross" label "Edit Motocross"
+#. item "Motorsport/Karting" text "Name"
 #. <key key="sport" value="motocross" />
-#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. item "Motorsport/Motocross" text "Name"
 #. <key key="sport" value="safety_training" />
-#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. item "Motorsport/Safety Training" text "Name"
 #. <key key="sport" value="model_aerodrome" />
-#. item "Motorsport/RC Car" label "Edit RC Car"
+#. item "Motorsport/Model Aerodrome" text "Name"
 #. <key key="sport" value="rc_car" />
-#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#. item "Motorsport/RC Car" text "Name"
 #. <key key="amenity" value="public_building" />
-#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#. item "Man-Made/Buildings/Public Building" text "Name"
 #. <key key="amenity" value="townhall" />
-#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#. item "Man-Made/Buildings/Town hall" text "Name"
 #. <key key="amenity" value="embassy" />
-#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#. item "Man-Made/Buildings/Embassy" text "Name"
 #. <key key="amenity" value="courthouse" />
-#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#. item "Man-Made/Buildings/Courthouse" text "Name"
 #. <key key="amenity" value="prison" />
-#. item "Man-Made/Buildings/Police" label "Edit Police"
+#. item "Man-Made/Buildings/Prison" text "Name"
 #. <key key="amenity" value="police" />
-#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#. item "Man-Made/Buildings/Police" text "Name"
 #. <key key="amenity" value="fire_station" />
-#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#. item "Man-Made/Buildings/Fire Station" text "Name"
 #. <key key="amenity" value="post_office" />
-#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#. item "Man-Made/Buildings/Post Office" text "Name"
 #. <key key="amenity" value="kindergarten" />
-#. item "Man-Made/Buildings/School" label "Edit School"
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
 #. <key key="amenity" value="school" />
-#. item "Man-Made/Buildings/University" label "Edit University"
+#. item "Man-Made/Buildings/School" text "Name"
 #. <key key="amenity" value="university" />
-#. item "Man-Made/Buildings/College" label "Edit College"
+#. item "Man-Made/Buildings/University" text "Name"
 #. <key key="amenity" value="college" />
-#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#. item "Man-Made/Buildings/College" text "Name"
 #. <key key="amenity" value="cinema" />
-#. item "Man-Made/Buildings/Library" label "Edit Library"
+#. item "Man-Made/Buildings/Cinema" text "Name"
 #. <key key="amenity" value="library" />
-#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#. item "Man-Made/Buildings/Library" text "Name"
 #. <key key="amenity" value="arts_centre" />
-#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
 #. <key key="amenity" value="theatre" />
-#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#. item "Man-Made/Buildings/Theatre" text "Name"
 #. <key key="amenity" value="place_of_worship" />
-#. item "Man Made/Works" label "Edit Works"
+#. item "Man-Made/Buildings/Place of Worship" text "Name"
 #. <key key="man_made" value="works" />
-#. item "Man Made/Tower" label "Edit Tower"
+#. item "Man Made/Works" text "Name"
 #. <key key="man_made" value="tower" />
-#. item "Man Made/Water Tower" label "Edit Water Tower"
+#. item "Man Made/Tower" text "Name"
 #. <key key="man_made" value="water_tower" />
-#. item "Man Made/Gasometer" label "Edit Gasometer"
+#. item "Man Made/Water Tower" text "Name"
 #. <key key="man_made" value="gasometer" />
-#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#. item "Man Made/Gasometer" text "Name"
 #. <key key="man_made" value="lighthouse" />
-#. item "Man Made/Windmill" label "Edit Windmill"
+#. item "Man Made/Lighthouse" text "Name"
 #. <key key="man_made" value="windmill" />
-#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#. item "Man Made/Windmill" text "Name"
 #. <key key="man_made" value="wastewater_plant" />
-#. item "Man Made/Crane" label "Edit Crane"
+#. item "Man Made/Wastewater Plant" text "Name"
 #. <key key="man_made" value="crane" />
-#. item "Man Made/Beacon" label "Edit Beacon"
+#. item "Man Made/Crane" text "Name"
 #. <key key="man_made" value="beacon" />
-#. item "Man Made/Survey Point" label "Edit Survey Point"
+#. item "Man Made/Beacon" text "Name"
 #. <key key="man_made" value="survey_point" />
-#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#. item "Man Made/Survey Point" text "Name"
 #. <key key="man_made" value="surveillance" />
-#. item "Man Made/Power Station" label "Edit Power Station"
+#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Power Generator" text "Name"
 #. <key key="power" value="station" />
-#. item "Amenities/Fountain" label "Edit Fountain"
+#. item "Man Made/Power Station" text "Name"
 #. <key key="amenity" value="fountain" />
-#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#. item "Amenities/Fountain" text "Name"
 #. <key key="amenity" value="drinking_water" />
-#. item "Food/Supermarket" label "Edit Supermarket"
+#. item "Amenities/Drinking Water" text "Name"
 #. <key key="shop" value="supermarket" />
-#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. item "Food/Supermarket" text "Name"
 #. <key key="shop" value="convenience" />
-#. item "Food/Kiosk" label "Edit Kiosk"
+#. item "Food/Convenience Store" text "Name"
 #. <key key="shop" value="kiosk" />
-#. item "Food/Butcher" label "Edit Butcher"
+#. item "Food/Kiosk" text "Name"
 #. <key key="shop" value="butcher" />
-#. item "Food/Baker" label "Edit Baker"
+#. item "Food/Butcher" text "Name"
 #. <key key="shop" value="bakery" />
-#. item "Food/Organic" label "Edit Organic Shop"
+#. item "Food/Baker" text "Name"
 #. <key key="shop" value="organic" />
-#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. item "Food/Organic" text "Name"
 #. <key key="shop" value="alcohol" />
-#. item "Food/Beverages" label "Edit Beverages Shop"
+#. item "Food/Alcohol" text "Name"
 #. <key key="shop" value="beverages" />
-#. item "Shops/Chemist" label "Edit Chemist"
+#. item "Food/Beverages" text "Name"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. item "Shops/Chemist" text "Name"
 #. <key key="shop" value="hairdresser" />
-#. item "Shops/Optician" label "Edit Optician"
+#. item "Shops/Hairdresser" text "Name"
 #. <key key="shop" value="optician" />
-#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. item "Shops/Optician" text "Name"
 #. <key key="shop" value="clothes" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. item "Shops/Clothes" text "Name"
 #. <key key="shop" value="shoes" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. item "Shops/Shoes" text "Name"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
+#. item "Shops/Outdoor" text "Name"
 #. <key key="shop" value="sports" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. item "Shops/Sports" text "Name"
 #. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
+#. item "Shops/Dry Cleaning" text "Name"
 #. <key key="shop" value="laundry" />
-#. item "Shops/Tailor" label "Edit Tailor"
+#. item "Shops/Laundry" text "Name"
 #. <key key="shop" value="tailor" />
-#. item "Shops/Computer" label "Edit Computer Shop"
+#. item "Shops/Tailor" text "Name"
 #. <key key="shop" value="computer" />
-#. item "Shops/Electronics" label "Edit Electronics Shop"
+#. item "Shops/Computer" text "Name"
 #. <key key="shop" value="electronics" />
-#. item "Shops/Hifi" label "Edit Hifi Shop"
+#. item "Shops/Electronics" text "Name"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Video" label "Edit Video Shop"
+#. item "Shops/Hifi" text "Name"
 #. <key key="shop" value="video" />
-#. item "Shops/Florist" label "Edit Florist"
+#. item "Shops/Video" text "Name"
 #. <key key="shop" value="florist" />
-#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#. item "Shops/Florist" text "Name"
 #. <key key="shop" value="garden_centre" />
-#. item "Shops/Hardware" label "Edit Hardware Store"
+#. item "Shops/Garden Centre" text "Name"
 #. <key key="shop" value="hardware" />
-#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#. item "Shops/Hardware" text "Name"
 #. <key key="shop" value="doityourself" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. item "Shops/Do-it-yourself-store" text "Name"
 #. <key key="shop" value="furniture" />
-#. item "Shops/Stationery" label "Edit Stationery Shop"
+#. item "Shops/Furniture" text "Name"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Book Store" label "Edit Book Store"
+#. item "Shops/Stationery" text "Name"
 #. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. item "Shops/Book Store" text "Name"
 #. <key key="shop" value="travel_agency" />
-#. item "Shops/Toys" label "Edit Toy Shop"
+#. item "Shops/Travel Agency" text "Name"
 #. <key key="shop" value="toys" />
-#. item "Cash/Bank" label "Edit Bank"
+#. item "Shops/Toys" text "Name"
 #. <key key="amenity" value="bank" />
-#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#. item "Cash/Bank" text "Name"
 #. <key key="amenity" value="bureau_de_change" />
-#. item "Health/Doctors" label "Edit Doctors"
+#. item "Cash/Money Exchange" text "Name"
 #. <key key="amenity" value="doctors" />
-#. item "Health/Dentist" label "Edit Dentist"
+#. item "Health/Doctors" text "Name"
 #. <key key="amenity" value="dentist" />
-#. item "Health/Hospital" label "Edit Hospital"
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
 #. <key key="amenity" value="hospital" />
-#. item "Health/Veterinary" label "Edit Veterinary"
+#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. item "Health/Veterinary" text "Name"
 #. <space />
 #. <key key="boundary" value="national" />
-#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. item "Geography/Boundaries/National" text "Name"
 #. <space />
 #. <key key="boundary" value="administrative" />
-#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. item "Geography/Boundaries/Administrative" text "Name"
 #. <space />
 #. <key key="boundary" value="civil" />
-#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. item "Geography/Boundaries/Civil" text "Name"
 #. <space />
 #. <key key="boundary" value="political" />
-#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. item "Geography/Boundaries/Political" text "Name"
 #. <space />
 #. <key key="boundary" value="national_park" />
-#. item "Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National park" text "Name"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Places/Country" label "Edit Country"
+#. item "Places/Continent" text "Name"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Places/State" label "Edit State"
+#. item "Places/Country" text "Name"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Places/Region" label "Edit Region"
+#. item "Places/State" text "Name"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Places/County" label "Edit County"
+#. item "Places/Region" text "Name"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Places/City" label "Edit City"
+#. item "Places/County" text "Name"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Places/Town" label "Edit Town"
+#. item "Places/City" text "Name"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Places/Suburb" label "Edit Suburb"
+#. item "Places/Town" text "Name"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Places/Village" label "Edit Village"
+#. item "Places/Suburb" text "Name"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Village" text "Name"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Places/Locality" label "Edit Locality"
+#. item "Places/Hamlet" text "Name"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Peak" label "Edit Peak"
+#. item "Places/Locality" text "Name"
 #. <key key="natural" value="peak" />
-#. item "Geography/Glacier" label "Edit Glacier"
+#. item "Geography/Peak" text "Name"
 #. <key key="natural" value="glacier" />
-#. item "Geography/Volcano" label "Edit Volcano"
+#. item "Geography/Glacier" text "Name"
 #. <key key="natural" value="volcano" />
-#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. item "Geography/Volcano" text "Name"
 #. <key key="natural" value="cave_entrance" />
-#. item "Geography/Island" label "Edit Island"
+#. item "Geography/Cave Entrance" text "Name"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Islet" label "Edit Islet"
+#. item "Geography/Island" text "Name"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Nature/Tree" label "Edit Tree"
+#. item "Geography/Islet" text "Name"
 #. <key key="natural" value="tree" />
-#. item "Nature/Wood" label "Edit Wood"
+#. item "Nature/Tree" text "Name"
 #. <key key="natural" value="wood" />
-#. item "Nature/Forest" label "Edit Forest Landuse"
+#. item "Nature/Wood" text "Name"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Forest" text "Name"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Nature/Scree" label "Edit Scree"
+#. item "Nature/Nature Reserve" text "Name"
 #. <key key="natural" value="scree" />
-#. item "Nature/Fell" label "Edit Fell"
+#. item "Nature/Scree" text "Name"
 #. <key key="natural" value="fell" />
-#. item "Nature/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" text "Name"
 #. <key key="natural" value="scrub" />
-#. item "Nature/Heath" label "Edit Heath"
+#. item "Nature/Scrub" text "Name"
 #. <key key="natural" value="heath" />
-#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#. item "Nature/Heath" text "Name"
 #. <space />
 #. <key key="landuse" value="farmyard" />
-#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#. item "Land use/Farmyard" text "Name"
 #. <space />
 #. <key key="landuse" value="farmland" />
-#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#. item "Land use/Farmland" text "Name"
 #. <space />
 #. <key key="landuse" value="meadow" />
-#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#. item "Land use/Meadow" text "Name"
 #. <space />
 #. <key key="landuse" value="vineyard" />
-#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#. item "Land use/Vineyard" text "Name"
 #. <space />
 #. <key key="landuse" value="allotments" />
-#. item "Land use/Garden" label "Edit Garden"
+#. item "Land use/Allotments" text "Name"
 #. <key key="leisure" value="garden" />
-#. item "Land use/Grass" label "Edit Grass Landuse"
+#. item "Land use/Garden" text "Name"
 #. <space />
 #. <key key="landuse" value="grass" />
-#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#. item "Land use/Grass" text "Name"
 #. <space />
 #. <key key="landuse" value="village_green" />
-#. item "Land use/Common" label "Edit Common"
+#. item "Land use/Village Green" text "Name"
 #. <key key="leisure" value="common" />
-#. item "Land use/Park" label "Edit Park"
+#. item "Land use/Common" text "Name"
 #. <key key="leisure" value="park" />
-#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#. item "Land use/Park" text "Name"
 #. <space />
 #. <key key="landuse" value="recreation_ground" />
-#. item "Land use/Residential area" label "Edit Residential Landuse"
+#. item "Land use/Recreation Ground" text "Name"
 #. <space />
 #. <key key="landuse" value="residential" />
-#. item "Land use/Graveyard" label "Edit Graveyard"
+#. item "Land use/Residential area" text "Name"
 #. <key key="amenity" value="grave_yard" />
-#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#. item "Land use/Graveyard" text "Name"
 #. <space />
 #. <key key="landuse" value="cemetery" />
-#. item "Land use/Retail" label "Edit Retail Landuse"
+#. item "Land use/Cemetery" text "Name"
 #. <space />
 #. <key key="landuse" value="retail" />
-#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#. item "Land use/Retail" text "Name"
 #. <space />
 #. <key key="landuse" value="commercial" />
-#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#. item "Land use/Commercial" text "Name"
 #. <space />
 #. <key key="landuse" value="industrial" />
-#. item "Land use/Railway land" label "Edit Railway Landuse"
+#. item "Land use/Industrial" text "Name"
 #. <space />
 #. <key key="landuse" value="railway" />
-#. item "Land use/Military" label "Edit Military Landuse"
+#. item "Land use/Railway land" text "Name"
 #. <space />
 #. <key key="landuse" value="military" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. item "Land use/Military" text "Name"
 #. <space />
 #. <key key="landuse" value="construction" />
-#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#. item "Land use/Construction area" text "Name"
 #. <space />
 #. <key key="landuse" value="brownfield" />
-#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#. item "Land use/Brownfield" text "Name"
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#. item "Land use/Greenfield" text "Name"
 #. <space />
 #. <key key="landuse" value="landfill" />
-#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#. item "Land use/Landfill" text "Name"
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#. item "Land use/Quarry" text "Name"
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#. item "Relations/Boundary" label "Edit Boundary"
+#. item "Relations/Multipolygon" text "Name"
 #. <key key="type" value="boundary" />
+#. item "Relations/Boundary" text "Name"
 #. <optional>
+#. item "Relations/Turn restriction" text "Name"
+#. item "Relations/Route" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
@@ -7260,144 +7276,144 @@
 #: build/trans_presets.java:657 build/trans_presets.java:718
 #: build/trans_presets.java:742 build/trans_presets.java:751
-#: build/trans_presets.java:811 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:988 build/trans_presets.java:998
-#: build/trans_presets.java:1006 build/trans_presets.java:1012
-#: build/trans_presets.java:1019 build/trans_presets.java:1026
-#: build/trans_presets.java:1033 build/trans_presets.java:1040
-#: build/trans_presets.java:1045 build/trans_presets.java:1052
-#: build/trans_presets.java:1057 build/trans_presets.java:1063
-#: build/trans_presets.java:1070 build/trans_presets.java:1080
-#: build/trans_presets.java:1086 build/trans_presets.java:1092
-#: build/trans_presets.java:1097 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1127 build/trans_presets.java:1133
-#: build/trans_presets.java:1150 build/trans_presets.java:1157
-#: build/trans_presets.java:1164 build/trans_presets.java:1261
-#: build/trans_presets.java:1312 build/trans_presets.java:1318
-#: build/trans_presets.java:1324 build/trans_presets.java:1330
-#: build/trans_presets.java:1337 build/trans_presets.java:1343
-#: build/trans_presets.java:1348 build/trans_presets.java:1361
-#: build/trans_presets.java:1387 build/trans_presets.java:1402
-#: build/trans_presets.java:1411 build/trans_presets.java:1417
-#: build/trans_presets.java:1425 build/trans_presets.java:1440
-#: build/trans_presets.java:1449 build/trans_presets.java:1459
-#: build/trans_presets.java:1468 build/trans_presets.java:1490
-#: build/trans_presets.java:1498 build/trans_presets.java:1505
-#: build/trans_presets.java:1516 build/trans_presets.java:1526
-#: build/trans_presets.java:1536 build/trans_presets.java:1556
-#: build/trans_presets.java:1568 build/trans_presets.java:1579
-#: build/trans_presets.java:1599 build/trans_presets.java:1608
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1699 build/trans_presets.java:1716
-#: build/trans_presets.java:1733 build/trans_presets.java:1750
-#: build/trans_presets.java:1767 build/trans_presets.java:1785
-#: build/trans_presets.java:1802 build/trans_presets.java:1821
-#: build/trans_presets.java:1842 build/trans_presets.java:1861
-#: build/trans_presets.java:1878 build/trans_presets.java:1897
-#: build/trans_presets.java:1915 build/trans_presets.java:1932
-#: build/trans_presets.java:1949 build/trans_presets.java:1965
-#: build/trans_presets.java:1972 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1993
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-#: build/trans_presets.java:2012 build/trans_presets.java:2020
-#: build/trans_presets.java:2027 build/trans_presets.java:2044
-#: build/trans_presets.java:2052 build/trans_presets.java:2071
-#: build/trans_presets.java:2081 build/trans_presets.java:2093
-#: build/trans_presets.java:2103 build/trans_presets.java:2108
-#: build/trans_presets.java:2116 build/trans_presets.java:2123
-#: build/trans_presets.java:2129 build/trans_presets.java:2135
-#: build/trans_presets.java:2141 build/trans_presets.java:2146
-#: build/trans_presets.java:2151 build/trans_presets.java:2156
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2174 build/trans_presets.java:2183
-#: build/trans_presets.java:2192 build/trans_presets.java:2201
-#: build/trans_presets.java:2210 build/trans_presets.java:2219
-#: build/trans_presets.java:2225 build/trans_presets.java:2233
-#: build/trans_presets.java:2239 build/trans_presets.java:2245
-#: 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:2281
-#: build/trans_presets.java:2287 build/trans_presets.java:2293
-#: build/trans_presets.java:2299 build/trans_presets.java:2305
-#: build/trans_presets.java:2311 build/trans_presets.java:2318
-#: build/trans_presets.java:2327 build/trans_presets.java:2335
-#: build/trans_presets.java:2341 build/trans_presets.java:2347
-#: build/trans_presets.java:2353 build/trans_presets.java:2359
-#: build/trans_presets.java:2365 build/trans_presets.java:2371
-#: build/trans_presets.java:2377 build/trans_presets.java:2383
-#: build/trans_presets.java:2389 build/trans_presets.java:2395
-#: build/trans_presets.java:2401 build/trans_presets.java:2407
-#: build/trans_presets.java:2413 build/trans_presets.java:2419
-#: build/trans_presets.java:2425 build/trans_presets.java:2431
-#: build/trans_presets.java:2437 build/trans_presets.java:2443
-#: build/trans_presets.java:2449 build/trans_presets.java:2457
-#: build/trans_presets.java:2463 build/trans_presets.java:2469
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2488 build/trans_presets.java:2502
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2536 build/trans_presets.java:2543
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2603 build/trans_presets.java:2611
-#: build/trans_presets.java:2621 build/trans_presets.java:2626
-#: build/trans_presets.java:2636 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2682 build/trans_presets.java:2688
-#: build/trans_presets.java:2694 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2813
-#: build/trans_presets.java:2820 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2847
-#: build/trans_presets.java:2854 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2933 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2953
-#: build/trans_presets.java:2959 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2979
-#: build/trans_presets.java:2986 build/trans_presets.java:2993
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3055 build/trans_presets.java:3064
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3093 build/trans_presets.java:3100
-#: build/trans_presets.java:3127 build/trans_presets.java:3138
-#: build/trans_presets.java:3144 build/trans_presets.java:3150
-#: build/trans_presets.java:3156 build/trans_presets.java:3162
-#: build/trans_presets.java:3170 build/trans_presets.java:3176
-#: build/trans_presets.java:3182 build/trans_presets.java:3188
-#: build/trans_presets.java:3194 build/trans_presets.java:3201
-#: build/trans_presets.java:3208 build/trans_presets.java:3215
-#: build/trans_presets.java:3221 build/trans_presets.java:3227
-#: build/trans_presets.java:3235 build/trans_presets.java:3243
-#: build/trans_presets.java:3250 build/trans_presets.java:3257
-#: build/trans_presets.java:3264 build/trans_presets.java:3272
-#: build/trans_presets.java:3279 build/trans_presets.java:3288
-#: build/trans_presets.java:3298 build/trans_presets.java:3307
-#: build/trans_presets.java:3313 build/trans_presets.java:3319
-#: build/trans_presets.java:3325 build/trans_presets.java:3330
-#: build/trans_presets.java:3336 build/trans_presets.java:3346
-#: build/trans_presets.java:3352 build/trans_presets.java:3358
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3389 build/trans_presets.java:3395
-#: build/trans_presets.java:3400 build/trans_presets.java:3407
-#: build/trans_presets.java:3414 build/trans_presets.java:3420
-#: build/trans_presets.java:3429 build/trans_presets.java:3437
-#: build/trans_presets.java:3443 build/trans_presets.java:3449
-#: build/trans_presets.java:3456 build/trans_presets.java:3462
+#: build/trans_presets.java:812 build/trans_presets.java:965
+#: build/trans_presets.java:973 build/trans_presets.java:981
+#: build/trans_presets.java:989 build/trans_presets.java:1000
+#: build/trans_presets.java:1009 build/trans_presets.java:1015
+#: build/trans_presets.java:1023 build/trans_presets.java:1030
+#: build/trans_presets.java:1038 build/trans_presets.java:1045
+#: build/trans_presets.java:1050 build/trans_presets.java:1057
+#: build/trans_presets.java:1062 build/trans_presets.java:1068
+#: build/trans_presets.java:1075 build/trans_presets.java:1085
+#: build/trans_presets.java:1091 build/trans_presets.java:1097
+#: build/trans_presets.java:1102 build/trans_presets.java:1108
+#: build/trans_presets.java:1116 build/trans_presets.java:1125
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1155 build/trans_presets.java:1162
+#: build/trans_presets.java:1169 build/trans_presets.java:1266
+#: build/trans_presets.java:1317 build/trans_presets.java:1323
+#: build/trans_presets.java:1329 build/trans_presets.java:1335
+#: build/trans_presets.java:1342 build/trans_presets.java:1348
+#: build/trans_presets.java:1353 build/trans_presets.java:1366
+#: build/trans_presets.java:1392 build/trans_presets.java:1407
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1445
+#: build/trans_presets.java:1454 build/trans_presets.java:1464
+#: build/trans_presets.java:1473 build/trans_presets.java:1495
+#: build/trans_presets.java:1503 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1541 build/trans_presets.java:1561
+#: build/trans_presets.java:1573 build/trans_presets.java:1584
+#: build/trans_presets.java:1604 build/trans_presets.java:1613
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1705 build/trans_presets.java:1722
+#: build/trans_presets.java:1739 build/trans_presets.java:1756
+#: build/trans_presets.java:1773 build/trans_presets.java:1791
+#: build/trans_presets.java:1808 build/trans_presets.java:1827
+#: build/trans_presets.java:1848 build/trans_presets.java:1867
+#: build/trans_presets.java:1884 build/trans_presets.java:1903
+#: build/trans_presets.java:1921 build/trans_presets.java:1938
+#: build/trans_presets.java:1955 build/trans_presets.java:1971
+#: build/trans_presets.java:1978 build/trans_presets.java:1987
+#: build/trans_presets.java:1994 build/trans_presets.java:2001
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2052
+#: build/trans_presets.java:2060 build/trans_presets.java:2079
+#: build/trans_presets.java:2089 build/trans_presets.java:2101
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2125 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2144
+#: build/trans_presets.java:2150 build/trans_presets.java:2155
+#: build/trans_presets.java:2160 build/trans_presets.java:2165
+#: build/trans_presets.java:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2183 build/trans_presets.java:2192
+#: build/trans_presets.java:2201 build/trans_presets.java:2210
+#: build/trans_presets.java:2219 build/trans_presets.java:2228
+#: build/trans_presets.java:2234 build/trans_presets.java:2242
+#: build/trans_presets.java:2248 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2327
+#: build/trans_presets.java:2336 build/trans_presets.java:2344
+#: build/trans_presets.java:2350 build/trans_presets.java:2356
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2380
+#: build/trans_presets.java:2386 build/trans_presets.java:2392
+#: build/trans_presets.java:2398 build/trans_presets.java:2404
+#: build/trans_presets.java:2410 build/trans_presets.java:2416
+#: build/trans_presets.java:2422 build/trans_presets.java:2428
+#: build/trans_presets.java:2434 build/trans_presets.java:2440
+#: build/trans_presets.java:2446 build/trans_presets.java:2452
+#: build/trans_presets.java:2458 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2491
+#: build/trans_presets.java:2497 build/trans_presets.java:2511
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2545 build/trans_presets.java:2552
+#: build/trans_presets.java:2558 build/trans_presets.java:2565
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2605
+#: build/trans_presets.java:2612 build/trans_presets.java:2620
+#: build/trans_presets.java:2630 build/trans_presets.java:2635
+#: build/trans_presets.java:2645 build/trans_presets.java:2650
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2822
+#: build/trans_presets.java:2829 build/trans_presets.java:2842
+#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#: build/trans_presets.java:2889 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2962
+#: build/trans_presets.java:2968 build/trans_presets.java:2974
+#: build/trans_presets.java:2980 build/trans_presets.java:2988
+#: build/trans_presets.java:2995 build/trans_presets.java:3002
+#: build/trans_presets.java:3009 build/trans_presets.java:3015
+#: build/trans_presets.java:3021 build/trans_presets.java:3027
+#: build/trans_presets.java:3033 build/trans_presets.java:3039
+#: build/trans_presets.java:3064 build/trans_presets.java:3073
+#: build/trans_presets.java:3088 build/trans_presets.java:3094
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3136 build/trans_presets.java:3147
+#: build/trans_presets.java:3153 build/trans_presets.java:3159
+#: build/trans_presets.java:3165 build/trans_presets.java:3171
+#: build/trans_presets.java:3179 build/trans_presets.java:3186
+#: build/trans_presets.java:3193 build/trans_presets.java:3200
+#: build/trans_presets.java:3207 build/trans_presets.java:3215
+#: build/trans_presets.java:3223 build/trans_presets.java:3231
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3254 build/trans_presets.java:3263
+#: build/trans_presets.java:3271 build/trans_presets.java:3279
+#: build/trans_presets.java:3287 build/trans_presets.java:3296
+#: build/trans_presets.java:3304 build/trans_presets.java:3314
+#: build/trans_presets.java:3324 build/trans_presets.java:3333
+#: build/trans_presets.java:3339 build/trans_presets.java:3345
+#: build/trans_presets.java:3351 build/trans_presets.java:3356
+#: build/trans_presets.java:3362 build/trans_presets.java:3372
+#: build/trans_presets.java:3378 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3396
+#: build/trans_presets.java:3402 build/trans_presets.java:3408
+#: build/trans_presets.java:3415 build/trans_presets.java:3421
+#: build/trans_presets.java:3426 build/trans_presets.java:3433
+#: build/trans_presets.java:3440 build/trans_presets.java:3446
+#: build/trans_presets.java:3455 build/trans_presets.java:3463
 #: build/trans_presets.java:3469 build/trans_presets.java:3475
-#: build/trans_presets.java:3481 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3540
-#: build/trans_presets.java:3554 build/trans_presets.java:3573
-#: build/trans_presets.java:3587
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3495 build/trans_presets.java:3501
+#: build/trans_presets.java:3507 build/trans_presets.java:3513
+#: build/trans_presets.java:3519 build/trans_presets.java:3566
+#: build/trans_presets.java:3580 build/trans_presets.java:3599
+#: build/trans_presets.java:3613
 msgid "Name"
 msgstr "名前"
@@ -7825,9 +7841,9 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
 #, java-format
 msgid "This will change {0} object."
@@ -7835,24 +7851,24 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:248
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:301
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:555
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:404
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7860,5 +7876,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
 #, java-format
 msgid "This will change up to {0} object."
@@ -7866,77 +7882,77 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:946
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1002
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1068
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
@@ -7972,5 +7988,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1162
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
 msgid "Conflict in data"
@@ -8026,26 +8042,26 @@
 msgstr "リレーション \"{2}\" をダウンロード中 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:192
 msgid "Tags and Members"
 msgstr "タグとメンバ－"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:202
 msgid "Parent Relations"
 msgstr "親リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:195
 msgid "Child Relations"
 msgstr "子リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:335
 msgid "Apply Role:"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
 msgid "Enter a role and apply it to the selected relation members"
 msgstr "ロールを入力して選択されたリレーションメンバーに適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:619
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -8057,14 +8073,14 @@
 "参照をどうしますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:627
 msgid "Remove them, clean up relation"
 msgstr "削除し、リレーションをクリーンナップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:626
 msgid "Ignore them, leave relation as is"
 msgstr "無視し、リレーションはそのまま"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
 #, java-format
 msgid ""
@@ -8077,9 +8093,9 @@
 "か？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid "Multiple members referring to same primitive"
 msgstr "複数のメンバーが同じプリミティブを参照しています"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:689
 #, java-format
 msgid ""
@@ -8091,5 +8107,5 @@
 "起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:730
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -8097,5 +8113,5 @@
 "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:756
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -8103,5 +8119,5 @@
 "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -8111,5 +8127,5 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -8119,20 +8135,20 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
 msgid "Relation Editor: Remove Selected"
 msgstr "リレーション編集画面: 削除が選択されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896
 #, java-format
 msgid ""
@@ -8142,64 +8158,64 @@
 "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:920
 msgid "Select primitives for selected relation members"
 msgstr "選択されたリレーションメンバーのプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
 msgid "Sort the relation members"
 msgstr "リレーションメンバーをソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:942
 msgid "Sort"
 msgstr "並べ替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:943
 msgid "Relation Editor: Sort"
 msgstr "リレーション編集画面: ソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:963
 msgid "Reverse the order of the relation members"
 msgstr "リレーションメンバーの表示順序を反転する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Reverse"
 msgstr "逆順"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Relation Editor: Reverse"
 msgstr "リレーションエディタ:反転"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 msgid "Move the currently selected members up"
 msgstr "選択したメンバーを1つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
 msgid "Relation Editor: Move Up"
 msgstr "リレーション編集画面: 上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1005
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Relation Editor: Move Down"
 msgstr "リレーション編集画面: 下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1024
 msgid "Remove the currently selected members from this relation"
 msgstr "このリレーションから選択したメンバーを削除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Relation Editor: Remove"
 msgstr "リレーション編集画面: 削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043
 msgid "Delete the currently edited relation"
 msgstr "現在編集されたリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -8211,23 +8227,23 @@
 "それらはリレーションメンバーリストから削除されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
 msgid "Yes, create a conflict and close"
 msgstr "はい、競合を作成して閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1145
 msgid "Click to create a conflict and close this relation editor"
 msgstr "クリックして競合を作成し、このリレーションエディタを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
 msgid "No, continue editing"
 msgstr "いいえ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1151
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1158
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -8238,5 +8254,5 @@
 "集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1175
 #, java-format
 msgid ""
@@ -8247,50 +8263,50 @@
 "最初にこの競合を解決してからやり直してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
 msgid "Apply the current updates"
 msgstr "現在の更新を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
 msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
 msgid "Cancel the updates and close the dialog"
 msgstr "更新をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 msgid "Add an empty tag"
 msgstr "空のタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
 msgid "Download all incomplete members"
 msgstr "全ての不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
 msgid "Relation Editor: Download Members"
 msgstr "リレーション編集画面: メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
 msgid "Download selected incomplete members"
 msgstr "選択された不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
 msgid "Sets a role for the selected members"
 msgstr "選択されたメンバーにロールをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1359
 msgid "Apply Role"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 #, java-format
 msgid "You are setting an empty role on {0} primitive."
@@ -8298,29 +8314,29 @@
 msgstr[0] "{0} プリミティブに空のロールを設定しています。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376
 msgid "This is equal to deleting the roles of these primitives."
 msgstr "これはこれらのプリミティブのロールを削除することと同じです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1378
 msgid "Do you really want to apply the new role?"
 msgstr "新しいロールを本当に適用しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380
 msgid "Yes, apply it"
 msgstr "はい、適用します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1381
 msgid "No, do not apply"
 msgstr "いいえ、適用しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 msgid "Confirm empty role"
 msgstr "空のロールを確認"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1455
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "選択中のリレーションメンバーが参照しているリレーションを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1532
 msgid ""
 "Members from paste buffer cannot be added because they are not included in "
@@ -8654,34 +8670,32 @@
 
 #. Strings in JFileChooser
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
 #. <key key="junction" value="roundabout" />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. item "Highways/Streets/Roundabout" combo "Type"
 #. <key key="highway" value="crossing" />
-#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Motorcycle/Parking" text "Capacity"
-#. item "Man Made/Pipeline" text "Operator"
-#. item "Man Made/Surveillance" text "Name"
-#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. item "Waypoints/Pedestrian Crossing" combo "Type"
+#. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Water/Water/Wetland" combo "Type"
+#. item "Car/Parking" combo "Type"
+#. item "Motorcycle/Parking" combo "Type"
+#. item "Man Made/Pipeline" combo "Type"
+#. item "Man Made/Surveillance" combo "Type"
 #. <key key="power" value="generator" />
-#. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Nature/Tree" text "Name"
-#. item "Nature/Wood" text "Name"
-#. item "Nature/Forest" text "Name"
+#. item "Man Made/Power Generator" combo "Type"
+#. item "Man Made/Power Tower" combo "Type"
+#. item "Nature/Tree" text "Type"
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/specialmessages.java:71 build/trans_presets.java:412
 #: build/trans_presets.java:691 build/trans_presets.java:700
-#: build/trans_presets.java:1081 build/trans_presets.java:1389
-#: build/trans_presets.java:1461 build/trans_presets.java:2661
-#: build/trans_presets.java:2695 build/trans_presets.java:2704
-#: build/trans_presets.java:2730 build/trans_presets.java:3289
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:1086 build/trans_presets.java:1394
+#: build/trans_presets.java:1466 build/trans_presets.java:2670
+#: build/trans_presets.java:2704 build/trans_presets.java:2713
+#: build/trans_presets.java:2739 build/trans_presets.java:3315
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "Type"
 msgstr "タイプ"
 
-#. item "Ways/Path" combo "Wheelchairs"
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8704,8 +8718,8 @@
 #: build/trans_presets.java:476 build/trans_presets.java:500
 #: build/trans_presets.java:543 build/trans_presets.java:669
-#: build/trans_presets.java:691 build/trans_presets.java:1292
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1396 build/trans_presets.java:2804
-#: build/trans_presets.java:2805 build/trans_presets.java:2806
+#: build/trans_presets.java:691 build/trans_presets.java:1297
+#: build/trans_presets.java:1399 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:2813
+#: build/trans_presets.java:2814 build/trans_presets.java:2815
 msgid "unknown"
 msgstr "不明な"
@@ -9333,7 +9347,9 @@
 msgstr "ファイル名を選択"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: build/specialmessages.java:89
 msgid "No"
 msgstr "いいえ"
@@ -9513,41 +9529,43 @@
 msgstr "不完全なアップロードと保存"
 
-#. item "Highways/Streets/Motorway" text "Name"
-#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
+#. item "Highways/Streets/Motorway" combo "Layer"
 #. <space />
 #. <key key="highway" value="motorway_link" />
 #. <optional>
-#. item "Highways/Streets/Trunk" text "Name"
-#. item "Highways/Streets/Trunk Link" text "Reference"
+#. item "Highways/Streets/Motorway Link" combo "Layer"
+#. item "Highways/Streets/Trunk" combo "Layer"
 #. <optional>
-#. item "Highways/Streets/Primary" text "Name"
-#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
+#. item "Highways/Streets/Trunk Link" combo "Layer"
+#. item "Highways/Streets/Primary" combo "Layer"
 #. <space />
 #. <key key="highway" value="primary_link" />
 #. <optional>
-#. item "Highways/Streets/Secondary" text "Name"
-#. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Passing Places"
-#. item "Highways/Streets/Residential" check "Embankment"
-#. item "Highways/Streets/Living Street" check "Embankment"
-#. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Passing Places"
-#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
-#. item "Highways/Streets/Construction" check "Embankment"
-#. item "Highways/Streets/Roundabout" check "Embankment"
-#. item "Highways/Streets/Bridge" text "Name"
-#. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Dedicated Bridleway" check "Embankment"
-#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Steps" check "Embankment"
-#. item "Water/Water/Drain" text "Name"
-#. item "Water/Water/Ditch" text "Name"
-#. item "Water/Water/Stream" text "Name"
-#. item "Water/Water/Canal" text "Name"
-#. item "Water/Water/River" text "Name"
-#. item "Transport/Railway/Bus Guideway" check "Embankment"
+#. item "Highways/Streets/Primary Link" combo "Layer"
+#. item "Highways/Streets/Secondary" combo "Layer"
+#. item "Highways/Streets/Tertiary" combo "Layer"
+#. item "Highways/Streets/Unclassified" combo "Layer"
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Layer"
+#. item "Highways/Streets/Bridge" combo "Layer"
+#. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Track" combo "Layer"
+#. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
+#. item "Water/Water/Drain" combo "Layer"
+#. item "Water/Water/Ditch" combo "Layer"
+#. item "Water/Water/Stream" combo "Layer"
+#. item "Water/Water/Canal" combo "Layer"
+#. item "Water/Water/River" combo "Layer"
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
 #: build/trans_presets.java:89 build/trans_presets.java:106
@@ -9564,7 +9582,7 @@
 #: build/trans_presets.java:566 build/trans_presets.java:589
 #: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:989
-#: build/trans_presets.java:999 build/trans_presets.java:1267
+#: build/trans_presets.java:966 build/trans_presets.java:974
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:1001 build/trans_presets.java:1272
 msgid "Layer"
 msgstr "レイヤー"
@@ -10062,8 +10080,8 @@
 msgstr[0] "{0} トラック"
 
-#. item "Relations/Route" text "Symbol description"
+#. item "Relations/Route" text "Description"
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3590
+#: build/trans_presets.java:3616
 msgid "Description"
 msgstr "説明"
@@ -11884,28 +11902,71 @@
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
 
-#. item "Aerialway/Goods" text "Name"
 #. <separator/>
+#. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1357
 msgid "Car"
 msgstr "自動車"
 
-#. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Cattle Grid" check "Foot"
-#. item "Barriers/Spikes" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
-#. item "Barriers/Gate" check "Foot"
-#. item "Barriers/Lift Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Turnstile" check "Foot"
-#. item "Barriers/Sally Port" check "Foot"
-#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
-#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Cattle Grid" check "Bicycle"
+#. item "Barriers/Spikes" check "Bicycle"
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
+#. item "Barriers/Gate" check "Bicycle"
+#. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#. item "Barriers/Stile" check "Bicycle"
+#. item "Barriers/Turnstile" check "Bicycle"
+#. item "Barriers/Sally Port" check "Bicycle"
+#. group "Bicycle"
+#. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:768 build/trans_presets.java:787
+#: build/trans_presets.java:801 build/trans_presets.java:823
+#: build/trans_presets.java:860 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:909 build/trans_presets.java:921
+#: build/trans_presets.java:931 build/trans_presets.java:940
+#: build/trans_presets.java:949 build/trans_presets.java:1490
+#: build/trans_presets.java:1563
+msgid "Bicycle"
+msgstr "自転車"
+
+#. item "Highways/Streets/Road Restrictions" combo "Foot"
+#. item "Ways/Path" combo "Foot"
+#. <space />
+#. item "Barriers/Bollard" check "Foot"
+#. <space />
+#. item "Barriers/Cattle Grid" check "Foot"
+#. <space />
+#. item "Barriers/Spikes" check "Foot"
+#. <space />
+#. item "Barriers/Border Control" check "Foot"
+#. <space />
+#. item "Barriers/Entrance" check "Foot"
+#. <space />
+#. item "Barriers/Gate" check "Foot"
+#. <space />
+#. item "Barriers/Lift Gate" check "Foot"
+#. <space />
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. <space />
+#. item "Barriers/Bump Gate" check "Foot"
+#. <space />
+#. item "Barriers/Kissing Gate" check "Foot"
+#. <space />
+#. item "Barriers/Stile" check "Foot"
+#. <space />
+#. item "Barriers/Turnstile" check "Foot"
+#. <space />
+#. item "Barriers/Sally Port" check "Foot"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:389 build/trans_presets.java:497
 #: build/trans_presets.java:767 build/trans_presets.java:786
 #: build/trans_presets.java:800 build/trans_presets.java:822
@@ -11914,45 +11975,5 @@
 #: build/trans_presets.java:908 build/trans_presets.java:920
 #: build/trans_presets.java:930 build/trans_presets.java:939
-#: build/trans_presets.java:948 build/trans_presets.java:1485
-#: build/trans_presets.java:1558
-msgid "Bicycle"
-msgstr "自転車"
-
-#. item "Ways/Path" check "Oneway"
-#. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Cattle Grid" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Spikes" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Lift Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Bump Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. 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:49
-#: build/trans_presets.java:389 build/trans_presets.java:497
-#: build/trans_presets.java:766 build/trans_presets.java:785
-#: build/trans_presets.java:799 build/trans_presets.java:821
-#: build/trans_presets.java:858 build/trans_presets.java:871
-#: build/trans_presets.java:883 build/trans_presets.java:895
-#: build/trans_presets.java:907 build/trans_presets.java:919
-#: build/trans_presets.java:929 build/trans_presets.java:938
-#: build/trans_presets.java:947
+#: build/trans_presets.java:948
 msgid "Foot"
 msgstr "徒歩"
@@ -13082,5 +13103,5 @@
 msgstr "複数個"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:501
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -13096,5 +13117,5 @@
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13105,49 +13126,49 @@
 "にあるものと同じでなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "この地物の詳細情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明な必要条件: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "利用可能なロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "ロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "件数"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "エレメント"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13157,15 +13178,19 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
+msgid "Add relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13174,17 +13199,22 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:978
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+msgid "New relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15285,5 +15315,5 @@
 msgstr "トレースのアップロード"
 
-#. item "Ways/Path" combo "MTB Scale"
+#. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 #: build/trans_presets.java:491
@@ -15420,8 +15450,9 @@
 
 #. </optional>
+#. item "Annotation/Address Interpolation"
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:3512
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1202
+#: build/trans_presets.java:3538
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15498,90 +15529,90 @@
 msgstr "ウェイを個々のハウス番号に変換"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:308
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "{0} 付加番地に関連付ける"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:460
 msgid "City:"
 msgstr "市区:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:461
 msgid "State:"
 msgstr "都道府県:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:462
 msgid "Post Code:"
 msgstr "郵便番号:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:463
 msgid "Country:"
 msgstr "国"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:464
 msgid "Full Address:"
 msgstr "フルアドレス:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:499
 msgid "Optional Information:"
 msgstr "オプション情報"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:684
 msgid "Please select a street to associate with address interpolation way"
 msgstr "アドレス補間ウェイと関連付けるストリートを選択してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:697
 msgid "Please select address interpolation way for this street"
 msgstr "このストリートのアドレス補間ウェイを選択してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1084
 msgid "Expected odd numbers for addresses"
 msgstr "奇数番号のアドレスが期待されている"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1089
 msgid "Expected even numbers for addresses"
 msgstr "偶数番号のアドレスが期待されている"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1099
 msgid "Expected valid number for address increment"
 msgstr "アドレス増分に対して期待される適切な数値"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1112
 msgid "Country code must be 2 letters"
 msgstr "国コードは2文字でなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1284
 msgid "Please enter valid number for starting and ending address"
 msgstr "開始および終了アドレスに正しい値を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1302
 msgid "Alphabetic address must end with a letter"
 msgstr "アルファベットのアドレスは文字で終了しなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr "開始および終了番号はアルファベットアドレスが同じでなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1323
 msgid "Starting address letter must be less than ending address letter"
 msgstr "開始アドレス文字は終了アドレス文字よりも小さくなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1339
 msgid "Please enter valid number for starting address"
 msgstr "開始アドレスに正しい数字を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1342
 msgid "Please enter valid number for ending address"
 msgstr "終了アドレスに正しい数字を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1349
 msgid "Starting address number must be less than ending address number"
 msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:32
 msgid "Align Way Segments"
 msgstr "ウェイセグメントをアライン"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:33
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
@@ -15591,9 +15622,9 @@
 "させることで平行にします。"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
 msgid "Align Ways"
 msgstr "ウェイをアライン"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:77
 msgid ""
 "Please select two segments that don''t share any nodes\n"
@@ -15601,14 +15632,14 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:79
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:90
 msgid "AlignWayS: Alignment not possible"
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:89
 msgid "Aligning would result nodes outside the world.\n"
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
 msgid "I''m ready!"
 msgstr "準備完了！"
@@ -15616,5 +15647,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "AlignWays Tips"
 msgstr ""
@@ -15862,8 +15893,8 @@
 msgstr ""
 
-#. group "Man-Made"
+#. group "Man-Made/Buildings"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2503
 msgid "Buildings"
 msgstr "建物"
@@ -16063,6 +16094,4 @@
 "を使用)。"
 
-#. item "Man Made/Pipeline" combo "Type"
-#. color highway_track
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16074,5 +16103,5 @@
 #. <rule>
 #. <condition k="waterway" v="river"/>
-#. color riverbank
+#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16082,5 +16111,5 @@
 #. <rule>
 #. <condition k="waterway" v="canal"/>
-#. color stream
+#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16097,5 +16126,5 @@
 #. <rule>
 #. <condition k="waterway" v="drain"/>
-#. color marsh
+#. color water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16113,7 +16142,8 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
+#. color water
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2661 build/trans_style.java:1018
+#: build/trans_presets.java:2670 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3557
@@ -16134,5 +16164,4 @@
 msgstr ""
 
-#. color area
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16176,4 +16205,5 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
+#. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 #: build/trans_style.java:4425 build/trans_style.java:4432
@@ -16892,5 +16922,5 @@
 msgstr "GPXデータのレイヤーがありません"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
 msgid "Child script have returned invalid data."
 msgstr "子スクリプトが不正なデータを返した"
@@ -17160,4 +17190,21 @@
 msgid "Load set of images as a new layer."
 msgstr "新規レイヤーとして画像セットを読み込む."
+
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:56
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me@komzpa.net) "
+"with [irs rectify] in subject."
+msgstr ""
+
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
+msgid "Zoom level was not enough to record an offset precisely"
+msgstr ""
+
+#. if there are none, create one
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
+msgid "IRS Adjustment Layer"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18052,7 +18099,7 @@
 msgstr ""
 
-#. item "Bicycle/Rental" text "Name"
+#. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1513
 msgid "Public Transport"
 msgstr "公共交通機関"
@@ -18096,6 +18143,6 @@
 msgstr "トラック"
 
-#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
+#. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
 #: build/trans_presets.java:632
@@ -18743,13 +18790,4 @@
 msgstr "テラスハウス"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202
-msgid "Edit OpenSeaMap"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204
-msgid "Seamark Editor"
-msgstr "Seamarkエディタ"
-
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse"
@@ -19844,7 +19882,7 @@
 msgstr "ウェイのノードの複製"
 
-#. group "Relations"
+#. item "Relations/Multipolygon"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3533
+#: build/trans_presets.java:3559
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -20359,5 +20397,4 @@
 msgstr "水路のタイプ {0}"
 
-#. color building
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20366,4 +20403,5 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
+#. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
 #: build/trans_style.java:4404
@@ -21209,5 +21247,4 @@
 
 #. Landuse type used in multipolygons
-#. color basin
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -21217,4 +21254,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
+#. color forest
 #: build/specialmessages.java:15 build/trans_style.java:3293
 msgid "forest"
@@ -21613,11 +21651,16 @@
 "たときに行われます。"
 
+#. Plugin irsrectify
+#: build/trans_plugins.java:36
+msgid "A helper for IRS satellite adjustment."
+msgstr ""
+
 #. Plugin lakewalker
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:38
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:40
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21625,5 +21668,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21635,15 +21678,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "4 または5のウェイのセットに左折禁止を追加"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:46
 msgid "Simply convert an area to a multipolygon."
 msgstr "単純にエリアをマルチポリゴンに変換します。"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21654,5 +21697,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21665,15 +21708,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21682,5 +21725,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21688,5 +21731,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21696,5 +21739,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21705,5 +21748,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21714,10 +21757,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21725,15 +21768,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin reverter
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid "Plugin for reverting changesets"
 msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21743,5 +21786,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21753,10 +21796,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21765,5 +21808,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21774,15 +21817,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21795,15 +21838,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin toms
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21812,5 +21855,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21819,5 +21862,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21826,10 +21869,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21840,5 +21883,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21848,5 +21891,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21857,20 +21900,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21879,5 +21922,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:116
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21933,5 +21976,5 @@
 #. count: how often can the role occur (if not given unlimited number is assumed)
 #. type: the data types - way,node,relation,closedway (separated by comma)
-#. For external files the <annotations> should have following elements:
+#. For external files the <presets> should have following elements:
 #. - author           the author of the preset
 #. - version          a version number of some sort (e.g. creation date)
@@ -21943,5 +21986,5 @@
 #. The fields "name", "text", "display_values" may also be localized (e.g. de.name).
 #. When translations of equal words but different meanings may conflict, a translation
-#. context should be specified. Use "name_conext", "text_context" or "values_context"
+#. context should be specified. Use "name_context", "text_context" or "values_context"
 #. for this. The context should be a meaningful short description to help translators.
 #. In JOSM internally all "name", "text" and "display_values" are translated when
@@ -21949,84 +21992,70 @@
 #. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
-#. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#. unparsed line <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#. group "Highways"
 #: build/trans_presets.java:78
 msgid "Highways"
 msgstr "道路"
 
-#. group "Highways"
+#. group "Highways/Streets"
 #: build/trans_presets.java:79
 msgid "Streets"
 msgstr "ストリート"
 
-#. group "Highways/Streets"
-#. <button label="Exit" hotkey="E">
+#. item "Highways/Streets/Motorway"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
+#. <button label="Motorway" hotkey="1">
 #: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "自動車専用道路"
 
-#. item "Highways/Streets/Motorway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "自動車専用道路の編集"
 
-#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #. <space />
 #. <key key="highway" value="motorway" />
-#. item "Highways/Streets/Trunk" label "Edit Trunk"
+#. item "Highways/Streets/Motorway" text "Reference"
 #. <space />
 #. <key key="highway" value="trunk" />
-#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
+#. item "Highways/Streets/Trunk" text "Reference"
 #. <space />
 #. <key key="highway" value="trunk_link" />
-#. item "Highways/Streets/Primary" label "Edit Primary Road"
+#. item "Highways/Streets/Trunk Link" text "Reference"
 #. <space />
 #. <key key="highway" value="primary" />
-#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
+#. item "Highways/Streets/Primary" text "Reference"
 #. <space />
 #. <key key="highway" value="secondary" />
-#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
+#. item "Highways/Streets/Secondary" text "Reference"
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Airport/Runway" label "Edit Runway"
+#. item "Highways/Streets/Tertiary" text "Reference"
 #. <key key="aeroway" value="runway" />
 #. <optional>
-#. item "Airport/Taxiway" label "Edit Taxiway"
+#. item "Airport/Runway" text "Reference"
 #. <key key="aeroway" value="taxiway" />
 #. <optional>
-#. item "Airport/Helipad" label "Edit Helipad"
+#. item "Airport/Taxiway" text "Reference"
 #. <key key="aeroway" value="helipad" />
 #. <optional>
-#. item "Airport/Gate" label "Edit Terminal Gate"
+#. item "Airport/Helipad" text "Reference"
 #. <key key="aeroway" value="gate" />
-#. item "Man Made/Power Station" text "Operator"
-#. item "Relations/Route" text "Name"
+#. item "Airport/Gate" text "Reference"
+#. item "Man Made/Power Station" text "Reference"
+#. item "Relations/Route" text "Reference"
 #: build/trans_presets.java:86 build/trans_presets.java:122
 #: build/trans_presets.java:142 build/trans_presets.java:162
 #: build/trans_presets.java:199 build/trans_presets.java:219
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
-#: build/trans_presets.java:1636 build/trans_presets.java:1670
-#: build/trans_presets.java:2714 build/trans_presets.java:3588
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1676
+#: build/trans_presets.java:2723 build/trans_presets.java:3614
 msgid "Reference"
 msgstr "道路番号"
-
-#. item "Highways/Streets/Motorway" combo "Layer"
-#. item "Highways/Streets/Motorway Link" combo "Layer"
-#. item "Highways/Streets/Trunk" combo "Layer"
-#. item "Highways/Streets/Trunk Link" combo "Layer"
-#. item "Highways/Streets/Primary" combo "Layer"
-#. item "Highways/Streets/Primary Link" combo "Layer"
-#. item "Highways/Streets/Secondary" combo "Layer"
-#. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:421
-msgid "Lanes"
-msgstr "車線数"
 
 #. item "Highways/Streets/Motorway" combo "Lanes"
@@ -22037,10 +22066,30 @@
 #. item "Highways/Streets/Primary Link" combo "Lanes"
 #. item "Highways/Streets/Secondary" combo "Lanes"
-#. item "Highways/Streets/Tertiary" combo "Layer"
-#. item "Highways/Streets/Unclassified" combo "Layer"
-#. item "Highways/Streets/Bridge" combo "Layer"
-#. item "Highways/Streets/Tunnel" combo "Layer"
-#. item "Ways/Path" combo "Layer"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Lanes"
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
+msgid "Lanes"
+msgstr "車線数"
+
+#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
+#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Highways/Streets/Service" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #: build/trans_presets.java:91 build/trans_presets.java:108
 #: build/trans_presets.java:127 build/trans_presets.java:146
@@ -22051,36 +22100,41 @@
 #: build/trans_presets.java:396 build/trans_presets.java:436
 #: build/trans_presets.java:451 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:1269
+#: build/trans_presets.java:524 build/trans_presets.java:1274
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
 
-#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
-#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
-#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Unclassified" text "Name"
-#. item "Highways/Streets/Residential" text "Name"
+#. item "Highways/Streets/Motorway" check "Oneway"
+#. item "Highways/Streets/Motorway Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Oneway"
+#. item "Highways/Streets/Trunk Link" check "Oneway"
+#. item "Highways/Streets/Primary" check "Oneway"
+#. item "Highways/Streets/Primary Link" check "Oneway"
+#. item "Highways/Streets/Secondary" check "Oneway"
+#. item "Highways/Streets/Tertiary" check "Oneway"
+#. item "Highways/Streets/Unclassified" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Living Street" text "Name"
+#. item "Highways/Streets/Residential" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Pedestrian" text "Name"
+#. item "Highways/Streets/Living Street" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Service" text "Name"
-#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
+#. item "Highways/Streets/Service" check "Oneway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <key key="service" value="parking_aisle" />
 #. <optional>
-#. item "Highways/Streets/Road (Unknown Type)" text "Name"
-#. item "Highways/Streets/Construction" text "Name"
-#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Track" check "Embankment"
-#. item "Ways/Path" check "Embankment"
-#. item "Transport/Railway/Bus Guideway" text "Name"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Path" check "Oneway"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Steps" check "Oneway"
+#. item "Transport/Railway/Bus Guideway" check "Oneway"
 #: build/trans_presets.java:92 build/trans_presets.java:109
 #: build/trans_presets.java:128 build/trans_presets.java:147
@@ -22095,55 +22149,7 @@
 #: build/trans_presets.java:518 build/trans_presets.java:538
 #: build/trans_presets.java:561 build/trans_presets.java:583
-#: build/trans_presets.java:621 build/trans_presets.java:1262
+#: build/trans_presets.java:621 build/trans_presets.java:1267
 msgid "Oneway"
 msgstr "一方通行"
-
-#. item "Highways/Streets/Motorway" check "Oneway"
-#. item "Highways/Streets/Motorway Link" check "Oneway"
-#. item "Highways/Streets/Trunk" check "Motorroad"
-#. item "Highways/Streets/Trunk Link" check "Motorroad"
-#. item "Highways/Streets/Primary" check "Motorroad"
-#. item "Highways/Streets/Primary Link" check "Motorroad"
-#. item "Highways/Streets/Secondary" check "Oneway"
-#. item "Highways/Streets/Tertiary" check "Oneway"
-#. item "Highways/Streets/Unclassified" check "Oneway"
-#. item "Highways/Streets/Residential" check "Oneway"
-#. item "Highways/Streets/Living Street" check "Oneway"
-#. item "Highways/Streets/Pedestrian" check "Oneway"
-#. item "Highways/Streets/Service" check "Oneway"
-#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
-#. item "Highways/Streets/Construction" check "Oneway"
-#. item "Highways/Streets/Roundabout" check "Oneway"
-#. item "Highways/Streets/Roundabout" text "Width (meters)"
-#. </optional>
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Dedicated Bridleway" check "Oneway"
-#. item "Ways/Dedicated Cycleway" check "Oneway"
-#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
-#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Steps" check "Oneway"
-#. item "Transport/Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
-#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
-#. <action class="SetWaypointAction" params="tunnel start"/>
-#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
-#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
-#. </button>
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:425 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1263
-#: build/trans_surveyor.java:12
-msgid "Bridge"
-msgstr "橋"
 
 #. item "Highways/Streets/Motorway" check "Bridge"
@@ -22163,6 +22169,6 @@
 #. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
-#. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -22174,19 +22180,26 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:441 build/trans_presets.java:469
-#: build/trans_presets.java:493 build/trans_presets.java:520
-#: build/trans_presets.java:540 build/trans_presets.java:563
-#: build/trans_presets.java:585 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1264
-msgid "Tunnel"
-msgstr "トンネル"
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="tunnel start"/>
+#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
+#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
+#. </button>
+#. <button label="Bridge" hotkey="B" type="toggle">
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1268
+#: build/trans_surveyor.java:12
+msgid "Bridge"
+msgstr "橋"
 
 #. item "Highways/Streets/Motorway" check "Tunnel"
@@ -22206,4 +22219,6 @@
 #. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
+#. </optional>
+#. item "Highways/Streets/Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -22215,19 +22230,19 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1265
-msgid "Cutting"
-msgstr "切り通し"
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1269
+msgid "Tunnel"
+msgstr "トンネル"
 
 #. item "Highways/Streets/Motorway" check "Cutting"
@@ -22256,4 +22271,45 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1270
+msgid "Cutting"
+msgstr "切り通し"
+
+#. item "Highways/Streets/Motorway" check "Embankment"
+#. item "Highways/Streets/Motorway Link" check "Embankment"
+#. item "Highways/Streets/Trunk" check "Embankment"
+#. item "Highways/Streets/Trunk Link" check "Embankment"
+#. item "Highways/Streets/Primary" check "Embankment"
+#. item "Highways/Streets/Primary Link" check "Embankment"
+#. item "Highways/Streets/Secondary" check "Embankment"
+#. item "Highways/Streets/Tertiary" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#. item "Ways/Steps" check "Embankment"
+#. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: build/trans_presets.java:96 build/trans_presets.java:113
 #: build/trans_presets.java:133 build/trans_presets.java:152
@@ -22268,38 +22324,38 @@
 #: build/trans_presets.java:565 build/trans_presets.java:587
 #: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1271
 msgid "Embankment"
 msgstr "土手"
 
-#. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Motorway Link"
 #: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "自動車専用道路の連絡路"
 
-#. item "Highways/Streets/Motorway Link"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
 #: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "自動車専用道路の連絡路の編集"
 
-#. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Trunk"
 #: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "国道"
 
-#. item "Highways/Streets/Trunk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
 #: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "国道の編集"
 
-#. item "Highways/Streets/Trunk" check "Oneway"
-#. item "Highways/Streets/Trunk Link" check "Oneway"
-#. item "Highways/Streets/Primary" check "Oneway"
-#. item "Highways/Streets/Primary Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Motorroad"
+#. item "Highways/Streets/Trunk Link" check "Motorroad"
+#. item "Highways/Streets/Primary" check "Motorroad"
+#. item "Highways/Streets/Primary Link" check "Motorroad"
 #: build/trans_presets.java:129 build/trans_presets.java:148
 #: build/trans_presets.java:169 build/trans_presets.java:185
@@ -22307,100 +22363,100 @@
 msgstr "車道"
 
-#. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Trunk Link"
 #: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "国道の連絡路"
 
-#. item "Highways/Streets/Trunk Link"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
 #: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
 
-#. item "Highways/Streets/Trunk Link" check "Embankment"
 #. </optional>
 #. <separator/>
-#. <button label="Motorway" hotkey="1">
+#. item "Highways/Streets/Primary"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
+#. <button label="Primary" hotkey="2">
 #: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "主要地方道"
 
-#. item "Highways/Streets/Primary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
 #: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "主要地方道を編集"
 
-#. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Primary Link"
 #: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "主要地方道の連絡路"
 
-#. item "Highways/Streets/Primary Link"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
 #: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "主要地方道の連絡路の編集"
 
-#. item "Highways/Streets/Primary Link" check "Embankment"
 #. </optional>
-#. <button label="Primary" hotkey="2">
+#. item "Highways/Streets/Secondary"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
+#. <button label="Secondary" hotkey="3">
 #: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "一般地方道"
 
-#. item "Highways/Streets/Secondary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
 #: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "一般地方道の編集"
 
-#. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Tertiary"
 #: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "一般道(2車線以上)"
 
-#. item "Highways/Streets/Tertiary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
 #: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "一般道(2車線以上)の編集"
 
-#. item "Highways/Streets/Tertiary" check "Embankment"
 #. </optional>
-#. <button label="Secondary" hotkey="3">
+#. item "Highways/Streets/Unclassified"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
+#. <button label="Unclassified" hotkey="4">
 #: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "一般道(2車線未満)"
 
-#. item "Highways/Streets/Unclassified"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
 #: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "一般道(2車線未満)の編集"
 
-#. item "Highways/Streets/Unclassified" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
-#. item "Ways/Dedicated Footway" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
+#. item "Highways/Streets/Service" check "Passing Places"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:245 build/trans_presets.java:319
 #: build/trans_presets.java:588 build/trans_presets.java:606
@@ -22408,21 +22464,25 @@
 msgstr "対向車待機所"
 
-#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
-#. item "Highways/Streets/Service" text "Max. speed (km/h)"
-#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
-#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
-#. item "Highways/Streets/Roundabout" combo "Lanes"
-#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Path" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
-#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#. item "Public Transport/Railway Platform" text "Reference (track number)"
-#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
+#. item "Highways/Streets/Residential" text "Width (meters)"
+#. item "Highways/Streets/Living Street" text "Width (meters)"
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. item "Highways/Streets/Service" text "Width (meters)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
+#. item "Ways/Track" text "Width (meters)"
+#. item "Ways/Path" text "Width (meters)"
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. item "Ways/Dedicated Footway" text "Width (meters)"
+#. item "Ways/Steps" text "Width (meters)"
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. item "Public Transport/Railway Platform" text "Width (meters)"
+#. item "Public Transport/Bus Platform" text "Width (meters)"
 #: build/trans_presets.java:248 build/trans_presets.java:266
 #: build/trans_presets.java:284 build/trans_presets.java:302
@@ -22434,50 +22494,25 @@
 #: build/trans_presets.java:567 build/trans_presets.java:590
 #: build/trans_presets.java:608 build/trans_presets.java:627
-#: build/trans_presets.java:1270 build/trans_presets.java:1546
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1275 build/trans_presets.java:1551
+#: build/trans_presets.java:1596
 msgid "Width (meters)"
 msgstr "幅(m)"
 
-#. item "Highways/Streets/Unclassified" text "Width (meters)"
 #. </optional>
-#. <button label="Unclassified" hotkey="4">
+#. item "Highways/Streets/Residential"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
+#. <button label="Residential" hotkey="5">
 #: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住区域内道路"
 
-#. item "Highways/Streets/Residential"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
 #: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "居住区域内道路の編集"
-
-#. item "Highways/Streets/Residential" combo "Layer"
-#. item "Highways/Streets/Living Street" combo "Layer"
-#. item "Highways/Streets/Pedestrian" combo "Layer"
-#. item "Highways/Streets/Service" combo "Layer"
-#. item "Highways/Streets/Parking Aisle" check "Oneway"
-#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Highways/Streets/Construction" combo "Layer"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
-#. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:265 build/trans_presets.java:283
-#: build/trans_presets.java:301 build/trans_presets.java:321
-#: build/trans_presets.java:336 build/trans_presets.java:353
-#: build/trans_presets.java:372 build/trans_presets.java:466
-#: build/trans_presets.java:489 build/trans_presets.java:517
-#: build/trans_presets.java:537 build/trans_presets.java:560
-#: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
-msgid "Surface"
-msgstr "表面"
 
 #. item "Highways/Streets/Residential" combo "Surface"
@@ -22504,5 +22539,16 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
+msgid "Surface"
+msgstr "表面"
+
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "paved"
 msgstr "舗装"
@@ -22515,5 +22561,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "unpaved"
 msgstr "未舗装"
@@ -22526,5 +22572,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "asphalt"
 msgstr "アスファルト"
@@ -22537,5 +22583,5 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "concrete"
 msgstr "コンクリート"
@@ -22548,5 +22594,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268 build/trans_presets.java:2796
+#: build/trans_presets.java:1273 build/trans_presets.java:2805
 msgid "metal"
 msgstr "金属"
@@ -22559,5 +22605,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268 build/trans_presets.java:2796
+#: build/trans_presets.java:1273 build/trans_presets.java:2805
 msgid "wood"
 msgstr "森"
@@ -22570,5 +22616,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "paving_stones"
 msgstr "敷石"
@@ -22581,5 +22627,5 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "cobblestone"
 msgstr "敷石"
@@ -22592,5 +22638,5 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "gravel"
 msgstr "砂利道"
@@ -22603,5 +22649,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "pebblestone"
 msgstr "小石"
@@ -22614,5 +22660,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "compacted"
 msgstr "圧縮"
@@ -22625,5 +22671,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1273
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
@@ -22636,5 +22682,5 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "grass"
 msgstr "草地"
@@ -22647,5 +22693,5 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "sand"
 msgstr "砂地"
@@ -22658,56 +22704,55 @@
 #: build/trans_presets.java:537 build/trans_presets.java:560
 #: build/trans_presets.java:582 build/trans_presets.java:601
-#: build/trans_presets.java:620 build/trans_presets.java:1268
+#: build/trans_presets.java:620 build/trans_presets.java:1273
 msgid "ground"
 msgstr "地表"
 
-#. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Living Street"
 #: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "私道"
 
-#. item "Highways/Streets/Living Street"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
 #: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "私道の編集"
 
-#. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Pedestrian"
 #: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "歩行者専用道路"
 
-#. item "Highways/Streets/Pedestrian"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
 #: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "歩行者専用道路の編集"
 
-#. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Service"
 #: build/trans_presets.java:305
 msgid "Service"
 msgstr "敷地内道路"
 
-#. item "Highways/Streets/Service"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
+#. item "Highways/Streets/Service" label "Edit Serviceway"
 #: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "敷地内道路の編集"
 
-#. item "Highways/Streets/Service" label "Edit Serviceway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <optional>
+#. item "Highways/Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "敷地内道路のタイプ"
 
-#. item "Highways/Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:312
 msgid "alley"
@@ -22722,14 +22767,14 @@
 msgstr "駐車場の通路"
 
-#. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Parking Aisle"
 #: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
 
-#. item "Highways/Streets/Parking Aisle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
 #: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
@@ -22737,32 +22782,32 @@
 
 #. </optional>
+#. item "Highways/Streets/Road (Unknown Type)"
 #: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
 
-#. item "Highways/Streets/Road (Unknown Type)"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
 
-#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Construction"
 #: build/trans_presets.java:358
 msgid "Construction"
 msgstr "工事中"
 
-#. item "Highways/Streets/Construction"
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
 #: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
+#. item "Highways/Streets/Construction" combo "Junction"
 #: build/trans_presets.java:373
 msgid "Junction"
 msgstr "ジャンクション"
 
-#. item "Highways/Streets/Construction" combo "Junction"
-#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22773,143 +22818,39 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
+#. color roundabout
 #: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "ロータリー交差点"
 
-#. item "Highways/Streets/Construction" text "Width (meters)"
 #. </optional>
 #. <separator/>
+#. item "Highways/Streets/Road Restrictions"
 #: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "通行制限"
 
-#. item "Highways/Streets/Road Restrictions"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
-#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#. item "Highways/Streets/Road Restrictions" check "Toll"
 #: build/trans_presets.java:384
 msgid "Toll"
 msgstr "料金"
 
-#. item "Highways/Streets/Road Restrictions" check "Toll"
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
 
-#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#. item "Ways/Track" combo "Layer"
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Ways/Track" combo "Access"
 #: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "アクセス"
 
-#. item "Highways/Streets/Road Restrictions" combo "Access"
-#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
-#. item "Highways/Streets/Road Restrictions" combo "Foot"
-#. item "Highways/Streets/Road Restrictions" combo "Goods"
-#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Highways/Streets/Road Restrictions" combo "Horse"
-#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
-#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
-#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Path" combo "Foot"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Waypoints/Traffic Calming" combo "Type"
-#. item "Car/Fuel" combo "With shop"
-#. item "Car/Parking" combo "Park and Ride"
-#. item "Car/Parking" combo "Fee"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Car/Parking" combo "Spaces for Women"
-#. item "Car/Parking" combo "Spaces for Parents"
-#. item "Motorcycle/Parking" combo "Fee"
-#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
-#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
-#. item "Public Transport/Bus Stop" combo "Shelter"
-#. item "Public Transport/Bus Stop" combo "Bench"
-#. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#. item "Travel/Accomodation/Hotel" combo "Internet access"
-#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
-#. item "Travel/Accomodation/Hotel" combo "Smoking"
-#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Motel" combo "Internet access"
-#. item "Travel/Accomodation/Motel" combo "Internet access fee"
-#. item "Travel/Accomodation/Motel" combo "Smoking"
-#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Guest House" combo "Internet access"
-#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
-#. item "Travel/Accomodation/Guest House" combo "Smoking"
-#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
-#. item "Travel/Accomodation/Chalet" combo "Internet access"
-#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
-#. item "Travel/Accomodation/Chalet" combo "Smoking"
-#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
-#. item "Travel/Accomodation/Hostel" combo "Internet access"
-#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
-#. item "Travel/Accomodation/Hostel" combo "Smoking"
-#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
-#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
-#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
-#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
-#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
-#. item "Travel/Accomodation/Camping Site" combo "Internet access"
-#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
-#. item "Travel/Accomodation/Camping Site" combo "Smoking"
-#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
-#. item "Food+Drinks/Restaurant" combo "Internet access"
-#. item "Food+Drinks/Restaurant" combo "Internet access fee"
-#. item "Food+Drinks/Restaurant" combo "Smoking"
-#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
-#. item "Food+Drinks/Fast Food" combo "Internet access"
-#. item "Food+Drinks/Fast Food" combo "Internet access fee"
-#. item "Food+Drinks/Fast Food" combo "Smoking"
-#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
-#. item "Food+Drinks/Food Court" combo "Internet access"
-#. item "Food+Drinks/Food Court" combo "Internet access fee"
-#. item "Food+Drinks/Food Court" combo "Smoking"
-#. item "Food+Drinks/Food Court" combo "Wheelchairs"
-#. item "Food+Drinks/Cafe" combo "Internet access"
-#. item "Food+Drinks/Cafe" combo "Internet access fee"
-#. item "Food+Drinks/Cafe" combo "Smoking"
-#. item "Food+Drinks/Cafe" combo "Wheelchairs"
-#. item "Food+Drinks/Pub" combo "Internet access"
-#. item "Food+Drinks/Pub" combo "Internet access fee"
-#. item "Food+Drinks/Pub" combo "Smoking"
-#. item "Food+Drinks/Pub" combo "Wheelchairs"
-#. item "Food+Drinks/Biergarten" combo "Internet access"
-#. item "Food+Drinks/Biergarten" combo "Internet access fee"
-#. item "Food+Drinks/Biergarten" combo "Smoking"
-#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
-#. item "Food+Drinks/Bar" combo "Internet access"
-#. item "Food+Drinks/Bar" combo "Internet access fee"
-#. item "Food+Drinks/Bar" combo "Smoking"
-#. item "Food+Drinks/Bar" combo "Wheelchairs"
-#. item "Food+Drinks/Nightclub" combo "Smoking"
-#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#. item "Tourism/Information Terminal" combo "Fee"
-#. item "Tourism/Audioguide" combo "Fee"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Amenities/Bench" combo "Backrest"
-#. item "Amenities/Hunting Stand" combo "Shelter"
-#. item "Amenities/Hunting Stand" combo "Hide"
-#. item "Amenities/Hunting Stand" combo "Lock"
-#. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -22923,55 +22864,54 @@
 #: build/trans_presets.java:502 build/trans_presets.java:503
 #: build/trans_presets.java:543 build/trans_presets.java:700
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_presets.java:1364
-#: build/trans_presets.java:1390 build/trans_presets.java:1391
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1396 build/trans_presets.java:1462
-#: build/trans_presets.java:1473 build/trans_presets.java:1474
-#: build/trans_presets.java:1475 build/trans_presets.java:1476
-#: build/trans_presets.java:1477 build/trans_presets.java:1580
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1722
-#: build/trans_presets.java:1736 build/trans_presets.java:1737
-#: build/trans_presets.java:1738 build/trans_presets.java:1739
-#: build/trans_presets.java:1754 build/trans_presets.java:1755
-#: build/trans_presets.java:1756 build/trans_presets.java:1757
-#: build/trans_presets.java:1771 build/trans_presets.java:1772
-#: build/trans_presets.java:1773 build/trans_presets.java:1774
-#: build/trans_presets.java:1788 build/trans_presets.java:1789
-#: build/trans_presets.java:1790 build/trans_presets.java:1791
-#: build/trans_presets.java:1805 build/trans_presets.java:1806
-#: build/trans_presets.java:1807 build/trans_presets.java:1808
-#: build/trans_presets.java:1828 build/trans_presets.java:1829
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1866 build/trans_presets.java:1867
-#: build/trans_presets.java:1883 build/trans_presets.java:1884
-#: build/trans_presets.java:1885 build/trans_presets.java:1886
-#: build/trans_presets.java:1902 build/trans_presets.java:1903
-#: build/trans_presets.java:1904 build/trans_presets.java:1905
-#: build/trans_presets.java:1918 build/trans_presets.java:1919
-#: build/trans_presets.java:1920 build/trans_presets.java:1921
-#: build/trans_presets.java:1935 build/trans_presets.java:1936
-#: build/trans_presets.java:1937 build/trans_presets.java:1938
-#: build/trans_presets.java:1952 build/trans_presets.java:1953
-#: build/trans_presets.java:2075 build/trans_presets.java:2085
-#: build/trans_presets.java:2753 build/trans_presets.java:2754
-#: build/trans_presets.java:2795 build/trans_presets.java:2804
-#: build/trans_presets.java:2805 build/trans_presets.java:2806
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1369
+#: build/trans_presets.java:1395 build/trans_presets.java:1396
+#: build/trans_presets.java:1399 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1467
+#: build/trans_presets.java:1478 build/trans_presets.java:1479
+#: build/trans_presets.java:1480 build/trans_presets.java:1481
+#: build/trans_presets.java:1482 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:1691 build/trans_presets.java:1692
+#: build/trans_presets.java:1693 build/trans_presets.java:1694
+#: build/trans_presets.java:1709 build/trans_presets.java:1710
+#: build/trans_presets.java:1711 build/trans_presets.java:1712
+#: build/trans_presets.java:1725 build/trans_presets.java:1726
+#: build/trans_presets.java:1727 build/trans_presets.java:1728
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1745
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1794 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1811 build/trans_presets.java:1812
+#: build/trans_presets.java:1813 build/trans_presets.java:1814
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1836 build/trans_presets.java:1837
+#: build/trans_presets.java:1853 build/trans_presets.java:1854
+#: build/trans_presets.java:1855 build/trans_presets.java:1856
+#: build/trans_presets.java:1870 build/trans_presets.java:1871
+#: build/trans_presets.java:1872 build/trans_presets.java:1873
+#: build/trans_presets.java:1889 build/trans_presets.java:1890
+#: build/trans_presets.java:1891 build/trans_presets.java:1892
+#: build/trans_presets.java:1908 build/trans_presets.java:1909
+#: build/trans_presets.java:1910 build/trans_presets.java:1911
+#: build/trans_presets.java:1924 build/trans_presets.java:1925
+#: build/trans_presets.java:1926 build/trans_presets.java:1927
+#: build/trans_presets.java:1941 build/trans_presets.java:1942
+#: build/trans_presets.java:1943 build/trans_presets.java:1944
+#: build/trans_presets.java:1958 build/trans_presets.java:1959
+#: build/trans_presets.java:2083 build/trans_presets.java:2093
+#: build/trans_presets.java:2762 build/trans_presets.java:2763
+#: build/trans_presets.java:2804 build/trans_presets.java:2813
+#: build/trans_presets.java:2814 build/trans_presets.java:2815
+#: build/trans_presets.java:3101
 msgid "yes"
 msgstr "はい"
 
-#. color permissive
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -22980,4 +22920,5 @@
 #. <rule>
 #. <condition k="access" v="private"/>
+#. color private
 #: build/trans_presets.java:386 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
@@ -22990,5 +22931,4 @@
 msgstr "私道"
 
-#. color private
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -22997,4 +22937,5 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
+#. color destination
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -23007,5 +22948,4 @@
 msgstr "行き先"
 
-#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23024,4 +22964,5 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
+#. color permissive
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -23056,5 +22997,4 @@
 msgstr ""
 
-#. item "Amenities/Toilets" combo "Wheelchair"
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -23069,54 +23009,55 @@
 #: build/trans_presets.java:503 build/trans_presets.java:543
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_presets.java:1292
-#: build/trans_presets.java:1364 build/trans_presets.java:1390
-#: build/trans_presets.java:1391 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1396
-#: build/trans_presets.java:1462 build/trans_presets.java:1473
-#: build/trans_presets.java:1474 build/trans_presets.java:1475
-#: build/trans_presets.java:1476 build/trans_presets.java:1477
-#: build/trans_presets.java:1580 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1722 build/trans_presets.java:1736
-#: build/trans_presets.java:1737 build/trans_presets.java:1738
-#: build/trans_presets.java:1739 build/trans_presets.java:1754
-#: build/trans_presets.java:1755 build/trans_presets.java:1756
-#: build/trans_presets.java:1757 build/trans_presets.java:1771
-#: build/trans_presets.java:1772 build/trans_presets.java:1773
-#: build/trans_presets.java:1774 build/trans_presets.java:1788
-#: build/trans_presets.java:1789 build/trans_presets.java:1790
-#: build/trans_presets.java:1791 build/trans_presets.java:1805
-#: build/trans_presets.java:1806 build/trans_presets.java:1807
-#: build/trans_presets.java:1808 build/trans_presets.java:1828
-#: build/trans_presets.java:1829 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1866
-#: build/trans_presets.java:1867 build/trans_presets.java:1883
-#: build/trans_presets.java:1884 build/trans_presets.java:1885
-#: build/trans_presets.java:1886 build/trans_presets.java:1902
-#: build/trans_presets.java:1903 build/trans_presets.java:1904
-#: build/trans_presets.java:1905 build/trans_presets.java:1918
-#: build/trans_presets.java:1919 build/trans_presets.java:1920
-#: build/trans_presets.java:1921 build/trans_presets.java:1935
-#: build/trans_presets.java:1936 build/trans_presets.java:1937
-#: build/trans_presets.java:1938 build/trans_presets.java:1952
-#: build/trans_presets.java:1953 build/trans_presets.java:2075
-#: build/trans_presets.java:2085 build/trans_presets.java:2753
-#: build/trans_presets.java:2754 build/trans_presets.java:2795
-#: build/trans_presets.java:2804 build/trans_presets.java:2805
-#: build/trans_presets.java:2806 build/trans_presets.java:3092
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1297
+#: build/trans_presets.java:1369 build/trans_presets.java:1395
+#: build/trans_presets.java:1396 build/trans_presets.java:1399
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1467 build/trans_presets.java:1478
+#: build/trans_presets.java:1479 build/trans_presets.java:1480
+#: build/trans_presets.java:1481 build/trans_presets.java:1482
+#: build/trans_presets.java:1585 build/trans_presets.java:1586
+#: build/trans_presets.java:1587 build/trans_presets.java:1691
+#: build/trans_presets.java:1692 build/trans_presets.java:1693
+#: build/trans_presets.java:1694 build/trans_presets.java:1709
+#: build/trans_presets.java:1710 build/trans_presets.java:1711
+#: build/trans_presets.java:1712 build/trans_presets.java:1725
+#: build/trans_presets.java:1726 build/trans_presets.java:1727
+#: build/trans_presets.java:1728 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1745 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1794
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1811
+#: build/trans_presets.java:1812 build/trans_presets.java:1813
+#: build/trans_presets.java:1814 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1836
+#: build/trans_presets.java:1837 build/trans_presets.java:1853
+#: build/trans_presets.java:1854 build/trans_presets.java:1855
+#: build/trans_presets.java:1856 build/trans_presets.java:1870
+#: build/trans_presets.java:1871 build/trans_presets.java:1872
+#: build/trans_presets.java:1873 build/trans_presets.java:1889
+#: build/trans_presets.java:1890 build/trans_presets.java:1891
+#: build/trans_presets.java:1892 build/trans_presets.java:1908
+#: build/trans_presets.java:1909 build/trans_presets.java:1910
+#: build/trans_presets.java:1911 build/trans_presets.java:1924
+#: build/trans_presets.java:1925 build/trans_presets.java:1926
+#: build/trans_presets.java:1927 build/trans_presets.java:1941
+#: build/trans_presets.java:1942 build/trans_presets.java:1943
+#: build/trans_presets.java:1944 build/trans_presets.java:1958
+#: build/trans_presets.java:1959 build/trans_presets.java:2083
+#: build/trans_presets.java:2093 build/trans_presets.java:2762
+#: build/trans_presets.java:2763 build/trans_presets.java:2804
+#: build/trans_presets.java:2813 build/trans_presets.java:2814
+#: build/trans_presets.java:2815 build/trans_presets.java:3101
 msgid "no"
 msgstr "いいえ"
 
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #: build/trans_presets.java:387
 msgid "Agricultural"
@@ -23146,32 +23087,17 @@
 msgstr ""
 
+#. item "Highways/Streets/Road Restrictions" combo "Goods"
 #: build/trans_presets.java:390
 msgid "Goods"
 msgstr "貨物トラック"
 
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
 #: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
 
-#. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
-#. item "Barriers/Gate" check "Bicycle"
-#. item "Barriers/Lift Gate" check "Bicycle"
-#. item "Barriers/Hampshire Gate" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:392 build/trans_presets.java:499
-#: build/trans_presets.java:768 build/trans_presets.java:801
-#: build/trans_presets.java:823 build/trans_presets.java:860
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:909
-#: build/trans_presets.java:949
-msgid "Horse"
-msgstr "馬"
-
+#. item "Highways/Streets/Road Restrictions" combo "Horse"
+#. item "Ways/Path" combo "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
 #. item "Barriers/Border Control" check "Horse"
@@ -23182,14 +23108,16 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:769 build/trans_presets.java:787
-#: build/trans_presets.java:802 build/trans_presets.java:824
-#: build/trans_presets.java:861 build/trans_presets.java:874
-#: build/trans_presets.java:886 build/trans_presets.java:898
-#: build/trans_presets.java:910 build/trans_presets.java:950
-#: build/trans_presets.java:1455
-msgid "Motorcycle"
-msgstr "バイク"
-
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:769 build/trans_presets.java:802
+#: build/trans_presets.java:824 build/trans_presets.java:861
+#: build/trans_presets.java:874 build/trans_presets.java:886
+#: build/trans_presets.java:898 build/trans_presets.java:910
+#: build/trans_presets.java:950
+msgid "Horse"
+msgstr "馬"
+
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Barriers/Bollard" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
@@ -23201,60 +23129,82 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:394 build/trans_presets.java:476
-#: build/trans_presets.java:503 build/trans_presets.java:788
+#. group "Motorcycle"
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:770 build/trans_presets.java:788
 #: build/trans_presets.java:803 build/trans_presets.java:825
 #: build/trans_presets.java:862 build/trans_presets.java:875
 #: build/trans_presets.java:887 build/trans_presets.java:899
 #: build/trans_presets.java:911 build/trans_presets.java:951
+#: build/trans_presets.java:1460
+msgid "Motorcycle"
+msgstr "バイク"
+
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#. item "Barriers/Spikes" check "Motorcar"
+#. item "Barriers/Border Control" check "Motorcar"
+#. item "Barriers/Entrance" check "Motorcar"
+#. item "Barriers/Gate" check "Motorcar"
+#. item "Barriers/Lift Gate" check "Motorcar"
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#. item "Barriers/Bump Gate" check "Motorcar"
+#. item "Barriers/Sally Port" check "Motorcar"
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:789
+#: build/trans_presets.java:804 build/trans_presets.java:826
+#: build/trans_presets.java:863 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:912 build/trans_presets.java:952
 msgid "Motorcar"
 msgstr "自動車"
 
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
 #: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
 
-#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
+#. item "Highways/Streets/Roundabout"
 #: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "ロータリー交差点"
 
-#. item "Highways/Streets/Roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
 
-#. item "Highways/Streets/Roundabout" combo "Type"
-#. color motorroad
 #. </rule>
 #.
@@ -23269,4 +23219,5 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
+#. color motorway
 #: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
@@ -23278,5 +23229,4 @@
 msgstr "自動車専用道路の連結路"
 
-#. color motorway
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23294,4 +23244,5 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
+#. color trunk
 #: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
@@ -23303,5 +23254,4 @@
 msgstr "国道の連絡路"
 
-#. color trunk
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23319,4 +23269,5 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
+#. color primary
 #: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
@@ -23328,5 +23279,4 @@
 msgstr "主要地方道の連絡路"
 
-#. color primary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23344,4 +23294,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
+#. color secondary
 #: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
@@ -23349,5 +23300,4 @@
 msgstr "一般地方道"
 
-#. color secondary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23357,4 +23307,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
+#. color tertiary
 #: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
@@ -23365,5 +23316,4 @@
 msgstr "一般道(2車線未満)"
 
-#. color green
 #. <icon src="misc/landmark/plant.png"/>
 #. <scale_min>1</scale_min>
@@ -23373,4 +23323,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
+#. color residential
 #: build/trans_presets.java:412 build/trans_style.java:3317
 msgid "residential"
@@ -23381,5 +23332,4 @@
 msgstr "私道"
 
-#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -23389,5 +23339,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#. color address
+#. color service
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -23419,4 +23369,5 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4476
@@ -23428,5 +23379,4 @@
 msgstr "バスレーン"
 
-#. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. <scale_min>1</scale_min>
@@ -23443,5 +23393,5 @@
 #. <rule>
 #. <condition k="highway" v="construction"/>
-#. color railland
+#. color construction
 #. <icon src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
@@ -23457,42 +23407,41 @@
 msgstr "工事中"
 
-#. item "Highways/Streets/Bridge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
 #: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
-#. item "Highways/Streets/Tunnel"
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
 #: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
 
-#. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
+#. group "Ways"
 #: build/trans_presets.java:456
 msgid "Ways"
 msgstr "ウェイ"
 
-#. group "Ways"
+#. item "Ways/Track"
 #: build/trans_presets.java:457
 msgid "Track"
 msgstr "トラック"
 
-#. item "Ways/Track"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#. item "Ways/Track" label "Edit Track"
 #: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#. item "Ways/Track" text "Name"
+#. item "Ways/Track" combo "Tracktype"
 #: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "トラック種別"
 
-#. item "Ways/Track" combo "Tracktype"
 #: build/trans_presets.java:465
 msgid "grade1"
@@ -23515,28 +23464,29 @@
 msgstr "grade5"
 
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Path" combo "MTB Scale"
 #: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
 
-#. item "Ways/Track" text "Width (meters)"
 #. </optional>
+#. item "Ways/Path"
 #: build/trans_presets.java:480
 msgid "Path"
 msgstr "小道"
 
-#. item "Ways/Path"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#. item "Ways/Path" label "Edit Path"
 #: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#. item "Ways/Path" text "Name"
+#. item "Ways/Path" combo "SAC Scale"
 #: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:488 build/trans_presets.java:3586
+#: build/trans_presets.java:488 build/trans_presets.java:3612
 msgid "hiking"
 msgstr "ハイキング"
@@ -23562,5 +23512,4 @@
 msgstr "難易度の高い山岳登山"
 
-#. item "Ways/Path" combo "Visibility"
 #: build/trans_presets.java:491
 msgid "excellent"
@@ -23571,5 +23520,5 @@
 msgstr ""
 
-#: build/trans_presets.java:491 build/trans_presets.java:2320
+#: build/trans_presets.java:491 build/trans_presets.java:2329
 msgid "intermediate"
 msgstr "中間"
@@ -23583,55 +23532,74 @@
 msgstr ""
 
-#: build/trans_presets.java:500 build/trans_presets.java:1688
-#: build/trans_presets.java:1706 build/trans_presets.java:1722
-#: build/trans_presets.java:1739 build/trans_presets.java:1757
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1808 build/trans_presets.java:1831
-#: build/trans_presets.java:1850 build/trans_presets.java:1867
-#: build/trans_presets.java:1886 build/trans_presets.java:1905
-#: build/trans_presets.java:1921 build/trans_presets.java:1938
-#: build/trans_presets.java:1953
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
+#: build/trans_presets.java:500 build/trans_presets.java:1694
+#: build/trans_presets.java:1712 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1763
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1814 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1911
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1959
 msgid "Wheelchairs"
 msgstr "車いす"
 
+#. item "Ways/Path" combo "Ski"
 #: build/trans_presets.java:501
 msgid "Ski"
 msgstr "スキー"
 
+#. item "Ways/Path" combo "Snowmobile"
 #: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "スノーモービル"
 
-#. item "Ways/Path" text "Width (meters)"
 #. </optional>
 #. <separator/>
+#. item "Ways/Dedicated Bridleway"
 #: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "馬車専用道"
 
-#. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
 #: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
 
-#. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Dedicated Cycleway"
 #: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "自転車専用道"
 
-#. item "Ways/Dedicated Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#. item "Ways/Segregated Foot- and Cycleway"
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#. item "Ways/Combined Foot- and Cycleway"
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
 #: build/trans_presets.java:532 build/trans_presets.java:552
 #: build/trans_presets.java:574
@@ -23639,228 +23607,229 @@
 msgstr "自転車道の編集"
 
-#. item "Ways/Dedicated Cycleway" check "Embankment"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
 
-#. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Segregated Foot- and Cycleway"
 #: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "分割された歩行者および自転車道"
 
-#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Combined Foot- and Cycleway"
 #: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "統合された歩行者および自転車道"
 
-#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Dedicated Footway"
 #: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "遊歩道"
 
-#. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+#. item "Ways/Dedicated Footway" label "Edit Footway"
 #: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
 
-#. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Steps"
 #: build/trans_presets.java:611
 msgid "Steps"
 msgstr "階段"
 
-#. item "Ways/Steps"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #: build/trans_presets.java:628
 msgid "Amount of Steps"
 msgstr ""
 
-#. group "Waypoints"
+#. item "Waypoints/Motorway Junction"
 #: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
 
-#. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
+#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
 #: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
-#. item "Waypoints/Motorway Junction" text "Name"
+#. item "Waypoints/Motorway Junction" text "Number"
 #: build/trans_presets.java:639
 msgid "Number"
 msgstr "数"
 
-#. item "Waypoints/Motorway Junction" text "Number"
+#. item "Waypoints/Services"
 #: build/trans_presets.java:641
 msgid "Services"
 msgstr "敷地内道路"
 
-#. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
+#. item "Waypoints/Services" label "Edit Service Station"
 #: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
 
-#. item "Waypoints/Services" text "Name"
-#. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
-#. item "Car/Wash" text "Brand"
-#. item "Car/Car Dealer" text "Name"
-#. item "Car/Repair" text "Brand"
-#. item "Car/Tyres" text "Brand"
-#. item "Car/Rental" text "Brand"
-#. item "Car/Sharing" text "Brand"
-#. item "Travel/Accomodation/Hotel" text "Name"
-#. item "Travel/Accomodation/Motel" text "Name"
-#. item "Travel/Accomodation/Hostel" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
-#. item "Tourism/Information Terminal" text "Closer description"
-#. item "Tourism/Audioguide" text "Closer description"
-#. item "Man-Made/Buildings/Post Office" text "Name"
-#. item "Man Made/Tower" text "Height (meters)"
-#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. item "Waypoints/Services" text "Operator"
+#. item "Barriers/Toll Booth" text "Operator"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Car Dealer" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" text "Operator"
+#. item "Tourism/Information Terminal" text "Operator"
+#. item "Tourism/Audioguide" text "Operator"
+#. item "Man-Made/Buildings/Post Office" text "Operator"
+#. item "Man Made/Tower" text "Operator"
 #. <key key="man_made" value="pipeline" />
-#. item "Man Made/Power Station" text "Name"
-#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Power Station" text "Operator"
 #. <key key="power" value="sub_station" />
-#. item "Amenities/Toilets"
+#. item "Man Made/Power Sub Station" text "Operator"
+#. item "Man Made/Power Line" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
 #. <key key="amenity" value="toilets" />
-#. item "Amenities/Post Box"
+#. item "Amenities/Toilets" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
-#. item "Amenities/Telephone" label "Edit Telephone"
+#. item "Amenities/Post Box" text "Operator"
 #. <key key="amenity" value="telephone" />
-#. item "Cash/Bank" text "Name"
-#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#. item "Amenities/Telephone" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#. item "Cash/Bank" text "Operator"
 #. <key key="amenity" value="atm" />
-#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. item "Cash/Automated Teller Machine" text "Operator"
 #. <key key="amenity" value="baby_hatch" />
-#. item "Health/Emergency Access Point" text "Point Name"
-#. item "Relations/Route" text "Network"
-#: build/trans_presets.java:648 build/trans_presets.java:812
-#: build/trans_presets.java:1362 build/trans_presets.java:1404
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1442
-#: build/trans_presets.java:1451 build/trans_presets.java:1470
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1822 build/trans_presets.java:1843
-#: build/trans_presets.java:1879 build/trans_presets.java:1898
-#: build/trans_presets.java:2073 build/trans_presets.java:2083
-#: build/trans_presets.java:2550 build/trans_presets.java:2630
-#: build/trans_presets.java:2660 build/trans_presets.java:2713
-#: build/trans_presets.java:2721 build/trans_presets.java:2738
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
-#: build/trans_presets.java:2767 build/trans_presets.java:3039
-#: build/trans_presets.java:3056 build/trans_presets.java:3071
-#: build/trans_presets.java:3106 build/trans_presets.java:3117
-#: build/trans_presets.java:3593
+#. item "Health/Baby Hatch" text "Operator"
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:648 build/trans_presets.java:813
+#: build/trans_presets.java:1367 build/trans_presets.java:1409
+#: build/trans_presets.java:1417 build/trans_presets.java:1424
+#: build/trans_presets.java:1432 build/trans_presets.java:1447
+#: build/trans_presets.java:1456 build/trans_presets.java:1475
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1828 build/trans_presets.java:1849
+#: build/trans_presets.java:1885 build/trans_presets.java:1904
+#: build/trans_presets.java:2081 build/trans_presets.java:2091
+#: build/trans_presets.java:2559 build/trans_presets.java:2639
+#: build/trans_presets.java:2669 build/trans_presets.java:2722
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:3048
+#: build/trans_presets.java:3065 build/trans_presets.java:3080
+#: build/trans_presets.java:3115 build/trans_presets.java:3126
+#: build/trans_presets.java:3619
 msgid "Operator"
 msgstr "操作員"
 
-#. item "Waypoints/Services" text "Operator"
 #. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#. item "Waypoints/Rest Area"
 #: build/trans_presets.java:652
 msgid "Rest Area"
 msgstr ""
 
-#. item "Waypoints/Rest Area"
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
 #: build/trans_presets.java:653
 msgid "Edit Rest Area"
 msgstr ""
 
-#. item "Waypoints/Rest Area" text "Name"
 #. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#. item "Waypoints/Emergency Phone"
 #: build/trans_presets.java:661
 msgid "Emergency Phone"
 msgstr "緊急電話"
 
-#. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
 #. <separator/>
+#. item "Waypoints/Traffic Signal"
 #: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "信号機"
 
-#. item "Waypoints/Traffic Signal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
 #: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
 
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#. item "Waypoints/Pedestrian Crossing" combo "Type"
-#. item "Transport/Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "uncontrolled"
 msgstr "マークだけ"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "traffic_signals"
 msgstr "信号機"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "island"
 msgstr "途中に島あり"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "unmarked"
 msgstr "マークなし"
 
-#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#. item "Waypoints/Traffic Signal" check "Cross on horseback"
+#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:670 build/trans_presets.java:693
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1298
 msgid "Cross on horseback"
 msgstr "馬用横断道"
 
-#. item "Waypoints/Traffic Signal" check "Cross on horseback"
-#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
+#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:671 build/trans_presets.java:692
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1299
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
 
-#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
-#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
-#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #: build/trans_presets.java:672 build/trans_presets.java:694
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1300
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
-#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
 
-#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
 #: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
@@ -23888,50 +23857,52 @@
 
 #. </optional>
+#. item "Waypoints/Stop"
 #: build/trans_presets.java:676
 msgid "Stop"
 msgstr "停止"
 
-#. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
+#. item "Waypoints/Mini-roundabout"
 #: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
 
-#. item "Waypoints/Mini-roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
+#. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:684
 msgid "Direction"
 msgstr "方向"
 
-#. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "時計回り"
 
+#. item "Waypoints/Pedestrian Crossing"
 #: build/trans_presets.java:686
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
 
-#. item "Waypoints/Pedestrian Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #: build/trans_presets.java:689
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
 #: build/trans_presets.java:695
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
+#. item "Waypoints/Traffic Calming"
 #: build/trans_presets.java:697
 msgid "Traffic Calming"
 msgstr "交通静穏化"
 
-#. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #: build/trans_presets.java:699
 msgid "Edit Traffic Calming"
@@ -23962,583 +23933,626 @@
 msgstr ""
 
+#. item "Waypoints/Passing Place"
 #: build/trans_presets.java:702
 msgid "Passing Place"
 msgstr "対向車待機所"
 
-#. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
 #: build/trans_presets.java:704
 msgid "Edit Passing Place"
 msgstr "対向車待機所を編集"
 
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
+#. item "Waypoints/Turning Circle"
 #: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "転回場"
 
-#. item "Waypoints/Turning Circle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
+#. item "Waypoints/City Limit"
 #: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "市境界標識"
 
-#. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
-#. item "Waypoints/City Limit" text "Name"
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "二つ目の名前"
 
-#. item "Waypoints/City Limit" text "Second Name"
+#. item "Waypoints/Speed Camera"
 #: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
 
-#. item "Waypoints/Speed Camera"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
 #. <separator/>
+#. item "Waypoints/Incline"
 #: build/trans_presets.java:726
 msgid "Incline"
 msgstr "坂"
 
-#. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
+#. item "Waypoints/Incline Steep"
 #: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "急な坂"
 
-#. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#. item "Waypoints/Grit Bin"
 #: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "凍結防止用のグリット入れ"
 
-#. item "Waypoints/Grit Bin"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
+#. item "Waypoints/Ford"
 #: build/trans_presets.java:737
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
-#. item "Waypoints/Ford"
+#. item "Waypoints/Ford" label "Edit Ford"
 #: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
 
-#. item "Waypoints/Ford" text "Name"
 #. </optional>
+#. item "Waypoints/Mountain Pass"
 #: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "峠道"
 
-#. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
+#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
 
-#. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Operator"
-#. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Peak" text "Name"
-#. item "Geography/Glacier" text "Name"
-#. item "Geography/Volcano" text "Name"
-#: build/trans_presets.java:752 build/trans_presets.java:1769
-#: build/trans_presets.java:2053 build/trans_presets.java:3244
-#: build/trans_presets.java:3251 build/trans_presets.java:3258
+#. item "Waypoints/Mountain Pass" text "Elevation"
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. item "Tourism/Guidepost" text "Elevation"
+#. item "Geography/Peak" text "Elevation"
+#. item "Geography/Glacier" text "Elevation"
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:752 build/trans_presets.java:1775
+#: build/trans_presets.java:2061 build/trans_presets.java:3264
+#: build/trans_presets.java:3272 build/trans_presets.java:3280
 msgid "Elevation"
 msgstr "高度"
 
-#. item "Waypoints/Mountain Pass" text "Elevation"
+#. item "Waypoints/Mountain Pass" text "Wikipedia"
+#. item "Water/Water/Canal" text "Wikipedia"
+#. item "Water/Water/River" text "Wikipedia"
+#. item "Water/Water/Waterfall" text "Wikipedia"
+#. item "Water/Water/Dam" text "Wikipedia"
+#. item "Airport/Airport Ground" text "Wikipedia"
+#. item "Tourism/Museum" text "Wikipedia"
+#. item "Tourism/Zoo" text "Wikipedia"
+#. item "Historic Places/Castle" text "Wikipedia"
+#. item "Places/Continent" text "Wikipedia"
+#. item "Places/Country" text "Wikipedia"
+#. item "Places/State" text "Wikipedia"
+#. item "Places/Region" text "Wikipedia"
+#. item "Places/County" text "Wikipedia"
+#. item "Places/City" text "Wikipedia"
+#. item "Places/Town" text "Wikipedia"
+#. item "Places/Suburb" text "Wikipedia"
+#. item "Places/Village" text "Wikipedia"
+#. item "Places/Hamlet" text "Wikipedia"
+#. item "Places/Locality" text "Wikipedia"
+#. item "Geography/Peak" text "Wikipedia"
+#. item "Geography/Glacier" text "Wikipedia"
+#. item "Geography/Volcano" text "Wikipedia"
+#. item "Geography/Cave Entrance" text "Wikipedia"
+#. item "Geography/Island" text "Wikipedia"
+#. item "Geography/Islet" text "Wikipedia"
+#. <space />
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:753 build/trans_presets.java:991
+#: build/trans_presets.java:1002 build/trans_presets.java:1016
+#: build/trans_presets.java:1031 build/trans_presets.java:1617
+#: build/trans_presets.java:1980 build/trans_presets.java:1989
+#: build/trans_presets.java:2112 build/trans_presets.java:3180
+#: build/trans_presets.java:3187 build/trans_presets.java:3194
+#: build/trans_presets.java:3201 build/trans_presets.java:3208
+#: build/trans_presets.java:3216 build/trans_presets.java:3224
+#: build/trans_presets.java:3232 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3255
+#: build/trans_presets.java:3265 build/trans_presets.java:3273
+#: build/trans_presets.java:3281 build/trans_presets.java:3288
+#: build/trans_presets.java:3297 build/trans_presets.java:3305
+#: build/trans_presets.java:3554
+msgid "Wikipedia"
+msgstr "Wikipedia"
+
 #. </optional>
-#: build/trans_presets.java:756
+#. group "Barriers"
+#: build/trans_presets.java:757
 msgid "Barriers"
 msgstr "ゲート等"
 
-#. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:759
+#. item "Barriers/Bollard"
+#: build/trans_presets.java:760
 msgid "Bollard"
 msgstr "車止め杭"
 
-#. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:761
+#. item "Barriers/Bollard" label "Edit Bollard"
+#: build/trans_presets.java:762
 msgid "Edit Bollard"
 msgstr "bollardの編集"
 
-#. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="cattle_grid" />
-#. item "Barriers/Spikes" label "Edit Spikes"
+#. item "Barriers/Cattle Grid" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Border Control" label "Edit Border Control"
+#. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
+#. item "Barriers/Border Control" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="entrance" />
-#. item "Barriers/Gate" label "Edit Gate"
+#. item "Barriers/Entrance" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="gate" />
-#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="lift_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="hampshire_gate" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Stile" label "Edit Stile"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="stile" />
-#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="turnstile" />
-#. item "Barriers/Sally Port" label "Edit Sally Port"
+#. item "Barriers/Turnstile" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:764 build/trans_presets.java:783
-#: build/trans_presets.java:797 build/trans_presets.java:819
-#: build/trans_presets.java:856 build/trans_presets.java:869
-#: build/trans_presets.java:881 build/trans_presets.java:893
-#: build/trans_presets.java:905 build/trans_presets.java:917
-#: build/trans_presets.java:927 build/trans_presets.java:936
-#: build/trans_presets.java:945
+#. item "Barriers/Sally Port" label "Allowed traffic:"
+#: build/trans_presets.java:765 build/trans_presets.java:784
+#: build/trans_presets.java:798 build/trans_presets.java:820
+#: build/trans_presets.java:857 build/trans_presets.java:870
+#: build/trans_presets.java:882 build/trans_presets.java:894
+#: build/trans_presets.java:906 build/trans_presets.java:918
+#: build/trans_presets.java:928 build/trans_presets.java:937
+#: build/trans_presets.java:946
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:771
+#. item "Barriers/Cycle Barrier"
+#: build/trans_presets.java:772
 msgid "Cycle Barrier"
 msgstr "自転車止め"
 
-#. item "Barriers/Cycle Barrier"
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:775
+#. item "Barriers/Block"
+#: build/trans_presets.java:776
 msgid "Block"
 msgstr "ブロック"
 
 # http://en.wikipedia.org/wiki/Cattle_grid
-#. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:778
+#. item "Barriers/Cattle Grid"
+#: build/trans_presets.java:779
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
 
-#. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:780
+#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#: build/trans_presets.java:781
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
 
 # http://en.wikipedia.org/wiki/Bus_trap
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:790
+#. item "Barriers/Bus Trap"
+#: build/trans_presets.java:791
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
 
-#. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:793
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:794
 msgid "Spikes"
 msgstr "車止めのとげ"
 
-#. item "Barriers/Spikes"
-#: build/trans_presets.java:794
+#. item "Barriers/Spikes" label "Edit Spikes"
+#: build/trans_presets.java:795
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:805
+#. item "Barriers/Toll Booth"
+#: build/trans_presets.java:806
 msgid "Toll Booth"
 msgstr "料金所"
 
-#. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:807
+#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#: build/trans_presets.java:808
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
 
-#. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:815
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:816
 msgid "Border Control"
 msgstr "国境検査所"
 
-#. item "Barriers/Border Control"
-#: build/trans_presets.java:816
+#. item "Barriers/Border Control" label "Edit Border Control"
+#: build/trans_presets.java:817
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
 
-#. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:830
+#. item "Barriers/Hedge"
+#: build/trans_presets.java:831
 msgid "Hedge"
 msgstr "生け垣"
 
-#. item "Barriers/Hedge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:834 build/trans_presets.java:836
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:835 build/trans_presets.java:837
 msgid "Fence"
 msgstr "フェンス"
 
-#. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:838
+#. item "Barriers/Wall"
+#: build/trans_presets.java:839
 msgid "Wall"
 msgstr "壁"
 
-#. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:841
+#. item "Barriers/City Wall"
+#: build/trans_presets.java:842
 msgid "City Wall"
 msgstr "城壁"
 
-#. item "Barriers/City Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:845
+#. item "Barriers/Retaining Wall"
+#: build/trans_presets.java:846
 msgid "Retaining Wall"
 msgstr "擁壁"
 
-#. item "Barriers/Retaining Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:852
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:853
 msgid "Entrance"
 msgstr "入口"
 
-#. item "Barriers/Entrance"
-#: build/trans_presets.java:853
+#. item "Barriers/Entrance" label "Edit Entrance"
+#: build/trans_presets.java:854
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
-#. item "Barriers/Entrance" check "Motorcar"
-#. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:864 build/trans_presets.java:1666
+#. item "Barriers/Gate"
+#: build/trans_presets.java:865
 msgid "Gate"
 msgstr "ゲート"
 
-#. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:866
+#. item "Barriers/Gate" label "Edit Gate"
+#: build/trans_presets.java:867
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:877
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:878
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
-#. item "Barriers/Lift Gate"
-#: build/trans_presets.java:878
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#: build/trans_presets.java:879
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:889
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:890
 msgid "Hampshire Gate"
 msgstr "ワイヤゲート"
 
-#. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:890
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#: build/trans_presets.java:891
 msgid "Edit Hampshire Gate"
 msgstr "ワイヤゲートの編集"
 
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:901
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:902
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
-#. item "Barriers/Bump Gate"
-#: build/trans_presets.java:902
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#: build/trans_presets.java:903
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:913
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:914
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
-#. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:914
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#: build/trans_presets.java:915
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:922
+#. item "Barriers/Stile"
+#: build/trans_presets.java:923
 msgid "Stile"
 msgstr "踏み越し段"
 
-#. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:924
+#. item "Barriers/Stile" label "Edit Stile"
+#: build/trans_presets.java:925
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:932
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:933
 msgid "Turnstile"
 msgstr "回転式木戸"
 
-#. item "Barriers/Turnstile"
-#: build/trans_presets.java:933
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#: build/trans_presets.java:934
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
-#. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:941
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:942
 msgid "Sally Port"
 msgstr "城の出撃路"
 
-#. item "Barriers/Sally Port"
-#: build/trans_presets.java:942
+#. item "Barriers/Sally Port" label "Edit Sally Port"
+#: build/trans_presets.java:943
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
 
-#. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/Covered Reservoir" text "Name"
+#. group "Water/Water"
 #. <separator/>
-#: build/trans_presets.java:956 build/trans_presets.java:957
-#: build/trans_presets.java:1048
+#. item "Water/Water/Water"
+#: build/trans_presets.java:957 build/trans_presets.java:958
+#: build/trans_presets.java:1053
 msgid "Water"
 msgstr "水域(湖沼)"
 
-#. group "Water/Water"
 #. <separator/>
-#: build/trans_presets.java:959
+#. item "Water/Water/Drain"
+#: build/trans_presets.java:960
 msgid "Drain"
 msgstr "側溝"
 
-#. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:961
+#. item "Water/Water/Drain" label "Edit Drain"
+#: build/trans_presets.java:962
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
-#. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:967
+#. item "Water/Water/Ditch"
+#: build/trans_presets.java:968
 msgid "Ditch"
 msgstr ""
 
-#. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:969
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#: build/trans_presets.java:970
 msgid "Edit Ditch"
 msgstr ""
 
-#. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:975
+#. item "Water/Water/Stream"
+#: build/trans_presets.java:976
 msgid "Stream"
 msgstr "小川"
 
-#. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:977
+#. item "Water/Water/Stream" label "Edit Stream"
+#: build/trans_presets.java:978
 msgid "Edit Stream"
 msgstr "小川の編集"
 
-#. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:983
+#. item "Water/Water/Canal"
+#: build/trans_presets.java:984
 msgid "Canal"
 msgstr "運河"
 
-#. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:985
+#. item "Water/Water/Canal" label "Edit Canal"
+#: build/trans_presets.java:986
 msgid "Edit Canal"
 msgstr "運河の編集"
 
-#. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:991
+#. item "Water/Water/River"
+#: build/trans_presets.java:993
 msgid "River"
 msgstr "川"
 
-#. item "Water/Water/River"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
 #. 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:995
+#. item "Water/Water/River" label "Edit River"
+#: build/trans_presets.java:997
 msgid "Edit River"
 msgstr "河川の編集"
 
-#. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1002
+#. item "Water/Water/Spring"
+#: build/trans_presets.java:1005
 msgid "Spring"
 msgstr "泉"
 
-#. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1004
+#. item "Water/Water/Spring" label "Edit Spring"
+#: build/trans_presets.java:1007
 msgid "Edit Spring"
 msgstr "泉の編集"
 
-#. item "Water/Water/Spring" text "Name"
-#: build/trans_presets.java:1008
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1011
 msgid "Waterfall"
 msgstr "滝"
 
-#. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1009
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#: build/trans_presets.java:1012
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
-#. item "Water/Water/Waterfall" text "Name"
-#: build/trans_presets.java:1014
+#. item "Water/Water/Weir"
+#: build/trans_presets.java:1018
 msgid "Weir"
 msgstr "堰"
 
-#. item "Water/Water/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1016
+#. item "Water/Water/Weir" label "Edit Weir"
+#: build/trans_presets.java:1020
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
-#. item "Water/Water/Weir" text "Name"
-#: build/trans_presets.java:1021
+#. item "Water/Water/Dam"
+#: build/trans_presets.java:1025
 msgid "Dam"
 msgstr "ダム"
 
-#. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1023
+#. item "Water/Water/Dam" label "Edit Dam"
+#: build/trans_presets.java:1027
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
-#. item "Water/Water/Dam" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1029
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1034
 msgid "Basin"
 msgstr "水たまり、窪地"
 
 # 水たまりになるような土地
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1030
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#: build/trans_presets.java:1035
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1035
+#. item "Water/Water/Reservoir"
+#: build/trans_presets.java:1040
 msgid "Reservoir"
 msgstr "ため池"
 
-#. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1037
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#: build/trans_presets.java:1042
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1042
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1047
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1043
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#: build/trans_presets.java:1048
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
 
-#. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1050
+#. item "Water/Water/Water" label "Edit Water"
+#: build/trans_presets.java:1055
 msgid "Edit Water"
 msgstr "水域の編集"
 
-#. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1054
+#. item "Water/Water/Land"
+#: build/trans_presets.java:1059
 msgid "Land"
 msgstr "陸地"
 
-#. item "Water/Water/Land"
-#: build/trans_presets.java:1055
+#. item "Water/Water/Land" label "Edit Land"
+#: build/trans_presets.java:1060
 msgid "Edit Land"
 msgstr "陸地の編集"
 
-#. item "Water/Water/Land" text "Name"
-#: build/trans_presets.java:1059
+#. item "Water/Water/Coastline"
+#: build/trans_presets.java:1064
 msgid "Coastline"
 msgstr "海岸線"
 
-#. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1061
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#: build/trans_presets.java:1066
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
 
-#. item "Water/Water/Coastline" text "Name"
-#: build/trans_presets.java:1065
+#. item "Water/Water/Riverbank"
+#: build/trans_presets.java:1070
 msgid "Riverbank"
 msgstr "川岸"
 
-#. item "Water/Water/Riverbank"
 #. <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:1068
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#: build/trans_presets.java:1073
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
-#. item "Water/Water/Riverbank" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1073
+#. item "Water/Water/Wetland"
+#: build/trans_presets.java:1078
 msgid "Wetland"
 msgstr "湿地帯"
 
-#. item "Water/Water/Wetland"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
 #. 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:1078
+#. item "Water/Water/Wetland" label "Edit Wetland"
+#: build/trans_presets.java:1083
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
-#. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "bog"
 msgstr "湿地"
 
-#. color woodarea
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -24548,97 +24562,96 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1081 build/trans_style.java:3549
+#. color marsh
+#: build/trans_presets.java:1086 build/trans_style.java:3549
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1083
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1088
 msgid "Mud"
 msgstr "泥地"
 
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1084
+#. item "Water/Water/Mud" label "Edit Mud"
+#: build/trans_presets.java:1089
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1088
+#. item "Water/Water/Beach"
+#: build/trans_presets.java:1093
 msgid "Beach"
 msgstr "砂浜"
 
-#. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1090
+#. item "Water/Water/Beach" label "Edit Beach"
+#: build/trans_presets.java:1095
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
-#. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1094
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1099
 msgid "Bay"
 msgstr "湾"
 
-#. item "Water/Water/Bay"
-#: build/trans_presets.java:1095
+#. item "Water/Water/Bay" label "Edit Bay"
+#: build/trans_presets.java:1100
 msgid "Edit Bay"
 msgstr "湾の編集"
 
-#. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1099
+#. item "Water/Water/Cliff"
+#: build/trans_presets.java:1104
 msgid "Cliff"
 msgstr "崖"
 
-#. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1101
+#. item "Water/Water/Cliff" label "Edit Cliff"
+#: build/trans_presets.java:1106
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
-#. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1106
+#. group "Shipping"
+#: build/trans_presets.java:1111
 msgid "Shipping"
 msgstr "港湾関連"
 
-#. group "Shipping"
-#: build/trans_presets.java:1107
+#. item "Shipping/Ferry Terminal"
+#: build/trans_presets.java:1112
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
 
-#. item "Shipping/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1109
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#: build/trans_presets.java:1114
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
-#. item "Shipping/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1117
 msgid "Cargo"
 msgstr ""
 
-#. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "passengers"
 msgstr ""
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "vehicle"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -24654,5 +24667,5 @@
 #. <rule>
 #. <condition k="bicycle" v="designated"/>
-#. color horse
+#. color bicycle
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24662,5 +24675,5 @@
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
-#. color foot
+#. color bicycle
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24680,5 +24693,5 @@
 #. <condition k="highway" v="path"/>
 #. <condition k="bicycle" v="official"/>
-#. color foot
+#. color bicycle
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -24698,5 +24711,5 @@
 #. <condition k="bicycle" v="official"/>
 #. <condition k="foot" v="official"/>
-#. color roundabout
+#. color bicycle
 #. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -24741,5 +24754,6 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:1112 build/trans_presets.java:3586
+#. color bicycle
+#: build/trans_presets.java:1117 build/trans_presets.java:3612
 #: build/trans_style.java:233 build/trans_style.java:689
 #: build/trans_style.java:715 build/trans_style.java:723
@@ -24751,165 +24765,152 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "hgv"
 msgstr ""
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "passengers;vehicle"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#. item "Shipping/Ferry Route"
+#: build/trans_presets.java:1119
 msgid "Ferry Route"
 msgstr "フェリー航路"
 
-#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1116
+#. item "Shipping/Ferry Route" label "Edit Ferry"
+#: build/trans_presets.java:1121
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
 
-#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1124
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1129
 msgid "Marina"
 msgstr "マリーナ"
 
-#. item "Shipping/Marina"
-#: build/trans_presets.java:1125
+#. item "Shipping/Marina" label "Edit Marina"
+#: build/trans_presets.java:1130
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
-#. item "Shipping/Marina" text "Name"
-#: build/trans_presets.java:1129
+#. item "Shipping/Pier"
+#: build/trans_presets.java:1134
 msgid "Pier"
 msgstr "桟橋"
 
-#. item "Shipping/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1131
+#. item "Shipping/Pier" label "Edit Pier"
+#: build/trans_presets.java:1136
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
-#. item "Shipping/Pier" text "Name"
-#: build/trans_presets.java:1135
+#. item "Shipping/Lock Gate"
+#: build/trans_presets.java:1140
 msgid "Lock Gate"
 msgstr "ロックゲート"
 
-#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1139
+#. item "Shipping/Turning Point"
+#: build/trans_presets.java:1144
 msgid "Turning Point"
 msgstr "転回地点"
 
-#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
 #. <separator/>
-#: build/trans_presets.java:1144
+#. item "Shipping/Slipway"
+#: build/trans_presets.java:1149
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
 
-#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. 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:1148
+#. item "Shipping/Slipway" label "Edit Slipway"
+#: build/trans_presets.java:1153
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
-#. item "Shipping/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#. item "Shipping/Boatyard"
+#: build/trans_presets.java:1157
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
 
-#. item "Shipping/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1154
+#. item "Shipping/Boatyard" label "Edit Boatyard"
+#: build/trans_presets.java:1159
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
-#. item "Shipping/Boatyard" text "Name"
-#: build/trans_presets.java:1159
+#. item "Shipping/Dock"
+#: build/trans_presets.java:1164
 msgid "Dock"
 msgstr "ドック"
 
-#. item "Shipping/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1161
+#. item "Shipping/Dock" label "Edit Dock"
+#: build/trans_presets.java:1166
 msgid "Edit Dock"
 msgstr "ドックの編集"
 
-#. item "Shipping/Dock" text "Name"
-#: build/trans_presets.java:1168
+#. group "Transport"
+#: build/trans_presets.java:1173
 msgid "Transport"
 msgstr "輸送"
 
-#. group "Transport"
-#: build/trans_presets.java:1169
+#. group "Transport/Railway"
+#: build/trans_presets.java:1174
 msgid "Railway"
 msgstr "鉄道"
 
-#. group "Transport/Railway"
-#: build/trans_presets.java:1170
+#. item "Transport/Railway/Rail"
+#: build/trans_presets.java:1175
 msgid "Rail"
 msgstr "線路"
 
-#. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1172
+#. item "Transport/Railway/Rail" label "Edit Rail"
+#: build/trans_presets.java:1177
 msgid "Edit Rail"
 msgstr "線路の編集"
 
-#. item "Transport/Railway/Rail" label "Edit Rail"
 #. <space />
 #. <key key="railway" value="rail" />
 #. <optional>
-#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
 #. <optional>
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="preserved" />
 #. <optional>
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="light_rail" />
 #. <optional>
-#. item "Transport/Railway/Subway" label "Edit Subway"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="subway" />
 #. <optional>
-#. item "Transport/Railway/Tram" label "Edit Tram"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1176 build/trans_presets.java:1188
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1248
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
 msgid "Gauge (mm)"
 msgstr "軌間(mm)"
 
-#. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
 #. <space />
 #. <key key="railway" value="monorail" />
 #. <optional>
-#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
-#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Subway" combo "Gauge (mm)"
-#. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1177 build/trans_presets.java:1189
-#: build/trans_presets.java:1201 build/trans_presets.java:1213
-#: build/trans_presets.java:1225 build/trans_presets.java:1237
-#: build/trans_presets.java:1249
-msgid "Types"
-msgstr "タイプ"
-
-#. item "Transport/Railway/Rail" combo "Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
 #. item "Transport/Railway/Monorail" combo "Types"
 #. item "Transport/Railway/Preserved" combo "Types"
@@ -24917,32 +24918,31 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1177 build/trans_presets.java:1189
-#: build/trans_presets.java:1201 build/trans_presets.java:1213
-#: build/trans_presets.java:1225 build/trans_presets.java:1237
-#: build/trans_presets.java:1249 build/trans_presets.java:1278
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254
+msgid "Types"
+msgstr "タイプ"
+
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "yard"
 msgstr "ヤード"
 
-#: build/trans_presets.java:1177 build/trans_presets.java:1189
-#: build/trans_presets.java:1201 build/trans_presets.java:1213
-#: build/trans_presets.java:1225 build/trans_presets.java:1237
-#: build/trans_presets.java:1249 build/trans_presets.java:1278
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1177 build/trans_presets.java:1189
-#: build/trans_presets.java:1201 build/trans_presets.java:1213
-#: build/trans_presets.java:1225 build/trans_presets.java:1237
-#: build/trans_presets.java:1249 build/trans_presets.java:1278
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "spur"
 msgstr "分岐線"
-
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250
-msgid "Electrified"
-msgstr "電化状態"
 
 #. item "Transport/Railway/Rail" combo "Electrified"
@@ -24953,12 +24953,18 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255
+msgid "Electrified"
+msgstr "電化状態"
+
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "contact_line"
 msgstr ""
 
-#. color foot
 #. <icon annotate="true" src="transport/steps.png"/>
 #. <scale_min>1</scale_min>
@@ -24968,5 +24974,5 @@
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
+#. color rail
 #. <icon annotate="true" src="vehicle/crossing.png"/>
 #. <scale_min>1</scale_min>
@@ -24976,5 +24982,5 @@
 #. <rule>
 #. <condition k="railway" v="rail"/>
-#. color oldrail
+#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -25018,15 +25024,15 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
 #. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1178 build/trans_presets.java:1190
-#: build/trans_presets.java:1202 build/trans_presets.java:1214
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_style.java:781
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25035,13 +25041,4 @@
 msgid "rail"
 msgstr "線路"
-
-#. item "Man Made/Power Line" text "Line reference"
-#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1179 build/trans_presets.java:1191
-#: build/trans_presets.java:1203 build/trans_presets.java:1215
-#: build/trans_presets.java:1227 build/trans_presets.java:1239
-#: build/trans_presets.java:1251 build/trans_presets.java:2741
-msgid "Voltage"
-msgstr "電圧"
 
 #. item "Transport/Railway/Rail" combo "Voltage"
@@ -25052,10 +25049,12 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1180 build/trans_presets.java:1192
-#: build/trans_presets.java:1204 build/trans_presets.java:1216
-#: build/trans_presets.java:1228 build/trans_presets.java:1240
-#: build/trans_presets.java:1252
-msgid "Frequency (Hz)"
-msgstr "周波数 (Hz)"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_presets.java:1244
+#: build/trans_presets.java:1256 build/trans_presets.java:2750
+msgid "Voltage"
+msgstr "電圧"
 
 #. item "Transport/Railway/Rail" combo "Frequency (Hz)"
@@ -25066,412 +25065,329 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1180 build/trans_presets.java:1192
-#: build/trans_presets.java:1204 build/trans_presets.java:1216
-#: build/trans_presets.java:1228 build/trans_presets.java:1240
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257
+msgid "Frequency (Hz)"
+msgstr "周波数 (Hz)"
+
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1183
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1188
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1184
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#: build/trans_presets.java:1189
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1195
+#. item "Transport/Railway/Monorail"
+#: build/trans_presets.java:1200
 msgid "Monorail"
 msgstr "モノレール"
 
-#. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1197
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#: build/trans_presets.java:1202
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
 #. </optional>
-#: build/trans_presets.java:1207
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1212
 msgid "Preserved"
 msgstr "保存鉄道"
 
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1208
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#: build/trans_presets.java:1213
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
 #. </optional>
-#: build/trans_presets.java:1219
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1224
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1220
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#: build/trans_presets.java:1225
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1231
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1236
 msgid "Subway"
 msgstr "地下鉄"
 
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1232
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#: build/trans_presets.java:1237
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
 #. </optional>
-#: build/trans_presets.java:1243
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1248
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1244
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#: build/trans_presets.java:1249
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1255
+#. item "Transport/Railway/Bus Guideway"
+#: build/trans_presets.java:1260
 msgid "Bus Guideway"
 msgstr "バスレーン"
 
-#. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1257
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#: build/trans_presets.java:1262
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
 
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1274
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1279
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1275
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
+#: build/trans_presets.java:1280
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1278
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1283
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#: build/trans_presets.java:1280
+#. item "Transport/Railway/Abandoned Rail"
+#: build/trans_presets.java:1285
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
 
-#. item "Transport/Railway/Abandoned Rail"
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1284
+#. item "Transport/Railway/Level Crossing"
+#: build/trans_presets.java:1289
 msgid "Level Crossing"
 msgstr "踏切"
 
-#. item "Transport/Railway/Level Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1288
+#. item "Transport/Railway/Crossing"
+#: build/trans_presets.java:1293
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
 
-#. item "Transport/Railway/Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1292
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:1297
 msgid "Crossing type"
 msgstr "踏切のタイプ"
 
-#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1298
+#. item "Transport/Railway/Turntable"
+#: build/trans_presets.java:1303
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
 
-#. item "Transport/Railway/Turntable"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1302
+#. item "Transport/Railway/Buffer Stop"
+#: build/trans_presets.java:1307
 msgid "Buffer Stop"
 msgstr "車止め"
 
-#. item "Transport/Railway/Buffer Stop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1307
+#. group "Aerialway"
+#: build/trans_presets.java:1312
 msgid "Aerialway"
 msgstr "リフト"
 
-#. group "Aerialway"
-#: build/trans_presets.java:1308
+#. item "Aerialway/Chair Lift"
+#: build/trans_presets.java:1313
 msgid "Chair Lift"
 msgstr "いすリフト"
 
-#. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1310
+#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#: build/trans_presets.java:1315
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
-#. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1314
+#. item "Aerialway/Drag Lift"
+#: build/trans_presets.java:1319
 msgid "Drag Lift"
 msgstr "Tバーリフト"
 
-#. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1316
+#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#: build/trans_presets.java:1321
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1320
+#. item "Aerialway/Cable Car"
+#: build/trans_presets.java:1325
 msgid "Cable Car"
 msgstr "ケーブルカー"
 
-#. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1322
+#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#: build/trans_presets.java:1327
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
-#. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1326
+#. item "Aerialway/Gondola"
+#: build/trans_presets.java:1331
 msgid "Gondola"
 msgstr "ゴンドラ"
 
-#. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1328
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#: build/trans_presets.java:1333
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
-#. item "Aerialway/Gondola" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1333
+#. item "Aerialway/Station"
+#: build/trans_presets.java:1338
 msgctxt "aerialway"
 msgid "Station"
 msgstr "駅"
 
-#. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1335
+#. item "Aerialway/Station" label "Edit Station"
+#: build/trans_presets.java:1340
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "駅の編集"
 
-#. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1339
+#. item "Aerialway/Pylon"
+#: build/trans_presets.java:1344
 msgctxt "aerialway"
 msgid "Pylon"
 msgstr ""
 
-#. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1341
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#: build/trans_presets.java:1346
 msgctxt "aerialway"
 msgid "Edit Pylon"
 msgstr ""
 
-#. item "Aerialway/Pylon" text "Name"
-#: build/trans_presets.java:1345
+#. item "Aerialway/Goods"
+#: build/trans_presets.java:1350
 msgctxt "aerialway"
 msgid "Goods"
 msgstr ""
 
-#. item "Aerialway/Goods"
-#: build/trans_presets.java:1346
+#. item "Aerialway/Goods" label "Edit Goods"
+#: build/trans_presets.java:1351
 msgctxt "aerialway"
 msgid "Edit Goods"
 msgstr ""
 
-#. group "Car"
-#: build/trans_presets.java:1353
+#. item "Car/Fuel"
+#: build/trans_presets.java:1358
 msgid "Fuel"
 msgstr "ガソリンスタンド"
 
-#. item "Car/Fuel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
 #. 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:1357
+#. item "Car/Fuel" label "Edit Fuel"
+#: build/trans_presets.java:1362
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
 
-#. item "Car/Fuel" label "Edit Fuel"
 #. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Tyres" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
-#. item "Motorcycle/Motorcycle Dealer" text "Name"
-#: build/trans_presets.java:1359 build/trans_presets.java:1403
-#: build/trans_presets.java:1418 build/trans_presets.java:1426
-#: build/trans_presets.java:1441 build/trans_presets.java:1450
-#: build/trans_presets.java:1469
+#. item "Car/Fuel" combo "Brand"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1364 build/trans_presets.java:1408
+#: build/trans_presets.java:1423 build/trans_presets.java:1431
+#: build/trans_presets.java:1446 build/trans_presets.java:1455
+#: build/trans_presets.java:1474
 msgid "Brand"
 msgstr ""
 
-#. item "Car/Fuel" combo "Brand"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Agip"
 msgstr "Agip(イタリア)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "BP"
 msgstr "BP(英国)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Esso"
 msgstr "エッソ"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "OMV"
 msgstr "OMV(オーストリア)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Q8"
 msgstr "Q8(クェート)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Repsol"
 msgstr "Repsol(スペイン)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Shell"
 msgstr "シェル石油"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Statoil"
 msgstr "Statoil(ノルウェー)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Tamoil"
 msgstr "Tamoil(オランダ)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Texaco"
 msgstr "Texaco(米国)"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Total"
 msgstr "Total(フランス)"
 
-#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1359 build/trans_presets.java:1469
+#: build/trans_presets.java:1364 build/trans_presets.java:1474
 msgid "Independent"
 msgstr ""
-
-#. item "Car/Fuel" text "Operator"
-#. item "Car/Wash" text "Operator"
-#. item "Car/Repair" text "Operator"
-#. item "Car/Tyres" text "Operator"
-#. item "Car/Rental" text "Operator"
-#. item "Car/Sharing" text "Operator"
-#. item "Motorcycle/Motorcycle Dealer" text "Operator"
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#. item "Food+Drinks/Biergarten" text "Name"
-#. item "Food+Drinks/Bar" text "Name"
-#. item "Food+Drinks/Nightclub" text "Name"
-#. item "Tourism/Attraction" text "Name"
-#. item "Tourism/Museum" text "Name"
-#. item "Tourism/Zoo" text "Name"
-#. item "Tourism/Theme Park" text "Name"
-#. item "Tourism/Information Office" text "Name"
-#. item "Historic Places/Ruins" text "Name"
-#. item "Historic Places/Archaeological Site" text "Name"
-#. item "Sports/Sport Facilities/Golf Course" text "Name"
-#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
-#. item "Man-Made/Buildings/Library" text "Name"
-#. item "Food/Supermarket" text "Name"
-#. item "Food/Convenience Store" text "Name"
-#. item "Food/Kiosk" text "Name"
-#. item "Food/Butcher" text "Name"
-#. item "Food/Baker" text "Name"
-#. item "Food/Organic" text "Name"
-#. item "Food/Alcohol" text "Name"
-#. item "Food/Beverages" text "Name"
-#. item "Shops/Chemist" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Optician" text "Name"
-#. item "Shops/Clothes" text "Name"
-#. item "Shops/Shoes" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Tailor" text "Name"
-#. item "Shops/Computer" text "Name"
-#. item "Shops/Electronics" text "Name"
-#. item "Shops/Hifi" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Garden Centre" text "Name"
-#. item "Shops/Hardware" text "Name"
-#. item "Shops/Do-it-yourself-store" text "Name"
-#. item "Shops/Furniture" text "Name"
-#. item "Shops/Stationery" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Toys" text "Name"
-#. item "Cash/Bank" text "Operator"
-#. item "Cash/Money Exchange" text "Name"
-#. item "Health/Doctors" text "Name"
-#. item "Health/Dentist" text "Name"
-#. item "Health/Pharmacy" text "Name"
-#. item "Health/Baby Hatch" text "Operator"
-#. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1916 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1966
-#: build/trans_presets.java:1973 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:2021
-#: build/trans_presets.java:2109 build/trans_presets.java:2117
-#: build/trans_presets.java:2220 build/trans_presets.java:2226
-#: build/trans_presets.java:2590 build/trans_presets.java:2614
-#: build/trans_presets.java:2834 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2855
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2875 build/trans_presets.java:2881
-#: build/trans_presets.java:2889 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2908
-#: build/trans_presets.java:2914 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2934
-#: build/trans_presets.java:2941 build/trans_presets.java:2947
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2980 build/trans_presets.java:2987
-#: build/trans_presets.java:2994 build/trans_presets.java:3001
-#: build/trans_presets.java:3007 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3057
-#: build/trans_presets.java:3065 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3094
-#: build/trans_presets.java:3107 build/trans_presets.java:3128
-msgid "Opening Hours"
-msgstr "営業時間"
 
 #. item "Car/Fuel" combo "Opening Hours"
@@ -25490,4 +25406,5 @@
 #. item "Food+Drinks/Bar" combo "Opening Hours"
 #. item "Food+Drinks/Nightclub" combo "Opening Hours"
+#. item "Tourism/Attraction" text "Opening Hours"
 #. item "Tourism/Museum" combo "Opening Hours"
 #. item "Tourism/Zoo" combo "Opening Hours"
@@ -25536,198 +25453,235 @@
 #. item "Health/Dentist" combo "Opening Hours"
 #. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Baby Hatch" text "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1916 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3007
-#: build/trans_presets.java:3013 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1972
+#: build/trans_presets.java:1979 build/trans_presets.java:1988
+#: build/trans_presets.java:1995 build/trans_presets.java:2029
+#: build/trans_presets.java:2118 build/trans_presets.java:2126
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2599 build/trans_presets.java:2623
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2864
+#: build/trans_presets.java:2871 build/trans_presets.java:2877
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2898 build/trans_presets.java:2904
+#: build/trans_presets.java:2910 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2930
+#: build/trans_presets.java:2936 build/trans_presets.java:2943
+#: build/trans_presets.java:2950 build/trans_presets.java:2956
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3003 build/trans_presets.java:3010
+#: build/trans_presets.java:3016 build/trans_presets.java:3022
+#: build/trans_presets.java:3028 build/trans_presets.java:3034
+#: build/trans_presets.java:3040 build/trans_presets.java:3066
+#: build/trans_presets.java:3074 build/trans_presets.java:3089
+#: build/trans_presets.java:3095 build/trans_presets.java:3103
+#: build/trans_presets.java:3116 build/trans_presets.java:3137
+msgid "Opening Hours"
+msgstr "営業時間"
+
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1916 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3007
-#: build/trans_presets.java:3013 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1916 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: build/trans_presets.java:3001 build/trans_presets.java:3007
-#: build/trans_presets.java:3013 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "火-日 8:00-15:00;土 8:00-12:00"
 
-#: build/trans_presets.java:1364
+#. item "Car/Fuel" combo "With shop"
+#: build/trans_presets.java:1369
 msgid "With shop"
 msgstr "店舗あり"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1369
 msgid "convenience"
 msgstr ""
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1369
 msgid "kiosk"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1370
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
-#. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1366
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1371
 msgid "Diesel"
 msgstr "ディーゼル"
 
-#. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1367
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1372
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
-#. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1368
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1373
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1369
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1374
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1370
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1375
 msgid "Octane 91"
 msgstr ""
 
-#. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1371
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1376
 msgid "Octane 95"
 msgstr ""
 
-#. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1372
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1377
 msgid "Octane 98"
 msgstr ""
 
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1373
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1378
 msgid "Octane 100"
 msgstr ""
 
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1374
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1379
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10%エタノール混合)"
 
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1375
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1380
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(85%エタノール混合)"
 
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1376
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1381
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1377
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1382
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1378
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1383
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1379
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#: build/trans_presets.java:1384
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
-#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
-#. group "Motorcycle"
-#. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
+#. item "Car/Parking"
+#. item "Motorcycle/Parking"
+#. item "Bicycle/Parking"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -25737,171 +25691,180 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1382 build/trans_presets.java:1456
-#: build/trans_presets.java:1486 build/trans_surveyor.java:24
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
+#: build/trans_presets.java:1387 build/trans_presets.java:1461
+#: build/trans_presets.java:1491 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "駐車場"
 
-#. item "Car/Parking"
 #. <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:1385
+#. item "Car/Parking" label "Edit Parking"
+#: build/trans_presets.java:1390
 msgid "Edit Parking"
 msgstr "駐車場の編集"
 
-#. item "Car/Parking" text "Name"
-#. item "Tourism/Information Terminal" text "Operator"
-#. item "Tourism/Audioguide" text "Operator"
-#. item "Amenities/Toilets" text "Operator"
-#. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1388 build/trans_presets.java:2074
-#: build/trans_presets.java:2084 build/trans_presets.java:2752
-#: build/trans_presets.java:3040
-msgid "Reference number"
-msgstr "参照番号"
-
-#. item "Car/Parking" combo "Type"
-#. item "Motorcycle/Parking" combo "Type"
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-msgid "multi-storey"
-msgstr "多階の建物"
-
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-msgid "surface"
-msgstr "表面"
-
-#. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-#: build/trans_presets.java:2662
-msgid "underground"
-msgstr "地下"
-
-#: build/trans_presets.java:1390
-msgid "Park and Ride"
-msgstr "パークアンドライド"
-
+#. item "Car/Parking" text "Reference number"
 #. item "Tourism/Information Terminal" text "Reference number"
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1391 build/trans_presets.java:1462
-#: build/trans_presets.java:2075 build/trans_presets.java:2085
-#: build/trans_presets.java:2753
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:1393 build/trans_presets.java:2082
+#: build/trans_presets.java:2092 build/trans_presets.java:2761
+#: build/trans_presets.java:3049
+msgid "Reference number"
+msgstr "参照番号"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+msgid "multi-storey"
+msgstr "多階の建物"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+msgid "surface"
+msgstr "表面"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+#: build/trans_presets.java:2671
+msgid "underground"
+msgstr "地下"
+
+#. item "Car/Parking" combo "Park and Ride"
+#: build/trans_presets.java:1395
+msgid "Park and Ride"
+msgstr "パークアンドライド"
+
+#. item "Car/Parking" combo "Fee"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Tourism/Information Terminal" combo "Fee"
+#. item "Tourism/Audioguide" combo "Fee"
+#. item "Amenities/Toilets" combo "Fee"
+#: build/trans_presets.java:1396 build/trans_presets.java:1467
+#: build/trans_presets.java:2083 build/trans_presets.java:2093
+#: build/trans_presets.java:2762
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1393
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1398
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1394
+#. item "Car/Parking" combo "Spaces for Disabled"
+#: build/trans_presets.java:1399
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1395
+#. item "Car/Parking" combo "Spaces for Women"
+#: build/trans_presets.java:1400
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1396
+#. item "Car/Parking" combo "Spaces for Parents"
+#: build/trans_presets.java:1401
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1397
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1402
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "他の収容能力はWiki を参照:[types]=*。"
 
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1399
+#. item "Car/Wash"
+#: build/trans_presets.java:1404
 msgid "Wash"
 msgstr "洗車場"
 
-#. item "Car/Wash"
-#: build/trans_presets.java:1400
+#. item "Car/Wash" label "Edit Car Wash"
+#: build/trans_presets.java:1405
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
-#: build/trans_presets.java:1407
+#. item "Car/Car Dealer"
+#: build/trans_presets.java:1412
 msgid "Car Dealer"
 msgstr "カーディーラ"
 
-#. item "Car/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1409
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#: build/trans_presets.java:1414
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
-#. item "Car/Car Dealer" text "Operator"
-#: build/trans_presets.java:1414 build/trans_presets.java:1475
+#. item "Car/Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#: build/trans_presets.java:1419 build/trans_presets.java:1480
 msgid "Repair"
 msgstr "自動車修理"
 
-#. item "Car/Repair"
-#: build/trans_presets.java:1415
+#. item "Car/Repair" label "Edit Car Repair"
+#: build/trans_presets.java:1420
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
 
-#: build/trans_presets.java:1422
+#. item "Car/Tyres"
+#: build/trans_presets.java:1427
 msgid "Tyres"
 msgstr "タイヤ店"
 
-#. item "Car/Tyres"
-#: build/trans_presets.java:1423
+#. item "Car/Tyres" label "Edit Tyres"
+#: build/trans_presets.java:1428
 msgid "Edit Tyres"
 msgstr "タイヤ店の編集"
 
-#: build/trans_presets.java:1429 build/trans_presets.java:1478
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#: build/trans_presets.java:1434 build/trans_presets.java:1483
 msgid "Contact:"
 msgstr "連絡先:"
 
-#. item "Car/Tyres" label "Contact:"
-#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
 #. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#. item "Annotation/Contact" label "Edit Contact information"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
 #. <space />
-#: build/trans_presets.java:1430 build/trans_presets.java:1479
-#: build/trans_presets.java:1690 build/trans_presets.java:1708
-#: build/trans_presets.java:1724 build/trans_presets.java:1741
-#: build/trans_presets.java:1759 build/trans_presets.java:1776
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1833 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1907 build/trans_presets.java:1923
-#: build/trans_presets.java:1940 build/trans_presets.java:1955
-#: build/trans_presets.java:3118 build/trans_presets.java:3522
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Health/Emergency Access Point" text "Phone Number"
+#. <space />
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1435 build/trans_presets.java:1484
+#: build/trans_presets.java:1696 build/trans_presets.java:1714
+#: build/trans_presets.java:1730 build/trans_presets.java:1747
+#: build/trans_presets.java:1765 build/trans_presets.java:1782
+#: build/trans_presets.java:1799 build/trans_presets.java:1816
+#: build/trans_presets.java:1839 build/trans_presets.java:1858
+#: build/trans_presets.java:1875 build/trans_presets.java:1894
+#: build/trans_presets.java:1913 build/trans_presets.java:1929
+#: build/trans_presets.java:1946 build/trans_presets.java:1961
+#: build/trans_presets.java:3127 build/trans_presets.java:3548
 msgid "Phone Number"
 msgstr "電話番号"
-
-#. item "Car/Tyres" text "Phone Number"
-#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1431 build/trans_presets.java:1480
-#: build/trans_presets.java:1691 build/trans_presets.java:1709
-#: build/trans_presets.java:1725 build/trans_presets.java:1742
-#: build/trans_presets.java:1760 build/trans_presets.java:1777
-#: build/trans_presets.java:1794 build/trans_presets.java:1811
-#: build/trans_presets.java:1834 build/trans_presets.java:1853
-#: build/trans_presets.java:1870 build/trans_presets.java:1889
-#: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_presets.java:1956
-#: build/trans_presets.java:3523
-msgid "Fax Number"
-msgstr "Fax番号"
 
 #. item "Car/Tyres" text "Fax Number"
@@ -25924,17 +25887,16 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#. <space />
-#: build/trans_presets.java:1432 build/trans_presets.java:1481
-#: build/trans_presets.java:1692 build/trans_presets.java:1710
-#: build/trans_presets.java:1726 build/trans_presets.java:1743
-#: build/trans_presets.java:1761 build/trans_presets.java:1778
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1835 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1890
-#: build/trans_presets.java:1909 build/trans_presets.java:1925
-#: build/trans_presets.java:1942 build/trans_presets.java:1957
-#: build/trans_presets.java:3525
-msgid "Website"
-msgstr "Webサイト"
+#: build/trans_presets.java:1436 build/trans_presets.java:1485
+#: build/trans_presets.java:1697 build/trans_presets.java:1715
+#: build/trans_presets.java:1731 build/trans_presets.java:1748
+#: build/trans_presets.java:1766 build/trans_presets.java:1783
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1840 build/trans_presets.java:1859
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1914 build/trans_presets.java:1930
+#: build/trans_presets.java:1947 build/trans_presets.java:1962
+#: build/trans_presets.java:3549
+msgid "Fax Number"
+msgstr "Fax番号"
 
 #. item "Car/Tyres" text "Website"
@@ -25956,6 +25918,605 @@
 #. item "Food+Drinks/Bar" text "Website"
 #. item "Food+Drinks/Nightclub" text "Website"
+#. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1433 build/trans_presets.java:1482
+#: build/trans_presets.java:1437 build/trans_presets.java:1486
+#: build/trans_presets.java:1698 build/trans_presets.java:1716
+#: build/trans_presets.java:1732 build/trans_presets.java:1749
+#: build/trans_presets.java:1767 build/trans_presets.java:1784
+#: build/trans_presets.java:1801 build/trans_presets.java:1818
+#: build/trans_presets.java:1841 build/trans_presets.java:1860
+#: build/trans_presets.java:1877 build/trans_presets.java:1896
+#: build/trans_presets.java:1915 build/trans_presets.java:1931
+#: build/trans_presets.java:1948 build/trans_presets.java:1963
+#: build/trans_presets.java:3551
+msgid "Website"
+msgstr "Webサイト"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#. item "Food+Drinks/Food Court" text "Email Address"
+#. item "Food+Drinks/Cafe" text "Email Address"
+#. item "Food+Drinks/Pub" text "Email Address"
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#. item "Food+Drinks/Bar" text "Email Address"
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#. item "Annotation/Contact" text "Email Address"
+#: build/trans_presets.java:1438 build/trans_presets.java:1487
+#: build/trans_presets.java:1699 build/trans_presets.java:1717
+#: build/trans_presets.java:1733 build/trans_presets.java:1750
+#: build/trans_presets.java:1768 build/trans_presets.java:1785
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1842 build/trans_presets.java:1861
+#: build/trans_presets.java:1878 build/trans_presets.java:1897
+#: build/trans_presets.java:1916 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1964
+#: build/trans_presets.java:3552
+msgid "Email Address"
+msgstr "Eメールアドレス"
+
+#. item "Car/Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Bicycle/Rental"
+#: build/trans_presets.java:1440 build/trans_presets.java:1479
+#: build/trans_presets.java:1505
+msgid "Rental"
+msgstr "レンタル"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+#. item "Car/Rental" label "Edit Car Rental"
+#: build/trans_presets.java:1443
+msgid "Edit Car Rental"
+msgstr "レンタカーの編集"
+
+#. item "Car/Sharing"
+#: build/trans_presets.java:1450
+msgid "Sharing"
+msgstr "自家用車共有"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#. item "Car/Sharing" label "Edit Car Sharing"
+#: build/trans_presets.java:1452
+msgid "Edit Car Sharing"
+msgstr "カーシェアリング"
+
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#: build/trans_presets.java:1462
+msgid "Edit Motorcycle Parking"
+msgstr "バイク駐車場の編集"
+
+#. item "Motorcycle/Parking" text "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1465 build/trans_presets.java:1496
+msgid "Capacity"
+msgstr "収容台数"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#: build/trans_presets.java:1469
+msgid "Motorcycle Dealer"
+msgstr "バイク店"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#: build/trans_presets.java:1471
+msgid "Edit Shop Motorcycle"
+msgstr "バイク店の編集"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1477
+msgid "Services:"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#: build/trans_presets.java:1478
+msgid "Sale"
+msgstr ""
+
+#: build/trans_presets.java:1480 build/trans_presets.java:1481
+msgid "brand"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#: build/trans_presets.java:1481
+msgid "Parts"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
+#. item "Amenities/Recycling" check "Clothes"
+#. <separator/>
+#. item "Shops/Clothes"
+#: build/trans_presets.java:1482 build/trans_presets.java:2791
+#: build/trans_presets.java:2913
+msgid "Clothes"
+msgstr "被服"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#: build/trans_presets.java:1493
+msgid "Edit Bicycle Parking"
+msgstr "駐輪場の編集"
+
+#. item "Bicycle/Bike Dealer"
+#: build/trans_presets.java:1498
+msgid "Bike Dealer"
+msgstr "自転車屋"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#: build/trans_presets.java:1501
+msgid "Edit Bicycle Shop"
+msgstr "自転車ショップの編集"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
+#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#: build/trans_presets.java:1508
+msgid "Edit Bicycle Rental"
+msgstr "自転車レンタルの編集"
+
+#. item "Public Transport/Station"
+#: build/trans_presets.java:1514
+msgctxt "railway"
+msgid "Station"
+msgstr "駅"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
+#. item "Public Transport/Station" label "Edit Station"
+#: build/trans_presets.java:1517
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "駅の編集"
+
+#. item "Public Transport/Station" text "UIC-Reference"
+#: build/trans_presets.java:1522
+msgid "UIC-Reference"
+msgstr "UIC-Reference"
+
+#. </optional>
+#. item "Public Transport/Railway Halt"
+#: build/trans_presets.java:1525
+msgid "Railway Halt"
+msgstr "停車場"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
+#. item "Public Transport/Railway Halt" label "Edit Halt"
+#: build/trans_presets.java:1527
+msgid "Edit Halt"
+msgstr "停止線の編集"
+
+#. </optional>
+#. item "Public Transport/Tram Stop"
+#: build/trans_presets.java:1534
+msgid "Tram Stop"
+msgstr "トラム停車場"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
+#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#: build/trans_presets.java:1537
+msgid "Edit Tram Stop"
+msgstr "トラム停車場の編集"
+
+#. </optional>
+#. item "Public Transport/Railway Platform"
+#: build/trans_presets.java:1544
+msgid "Railway Platform"
+msgstr "鉄道のプラットホーム"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
+#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
+#: build/trans_presets.java:1547
+msgid "Edit Railway Platform"
+msgstr "鉄道のプラットホームの編集"
+
+#. <key key="railway" value="platform" />
+#. <space />
+#. item "Public Transport/Railway Platform" text "Reference (track number)"
+#. <key key="highway" value="platform" />
+#. <space />
+#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#: build/trans_presets.java:1550 build/trans_presets.java:1595
+msgid "Reference (track number)"
+msgstr "リファレンス (ホームの番号)"
+
+#. item "Public Transport/Railway Platform" check "Area"
+#. item "Public Transport/Bus Platform" check "Area"
+#: build/trans_presets.java:1552 build/trans_presets.java:1597
+msgid "Area"
+msgstr "エリア"
+
+#. item "Public Transport/Subway Entrance"
+#: build/trans_presets.java:1554
+msgid "Subway Entrance"
+msgstr "地下鉄の入口"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
+#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#: build/trans_presets.java:1557
+msgid "Edit Subway Entrance"
+msgstr "地下鉄入口の編集"
+
+#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:1562 build/trans_presets.java:2763
+msgid "Wheelchair"
+msgstr "車いす"
+
+#. </optional>
+#. <separator/>
+#. item "Public Transport/Bus Station"
+#: build/trans_presets.java:1567
+msgid "Bus Station"
+msgstr "バスターミナル"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
+#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#: build/trans_presets.java:1570
+msgid "Edit Bus Station"
+msgstr "バスターミナルの編集"
+
+#. </optional>
+#. item "Public Transport/Bus Stop"
+#: build/trans_presets.java:1576
+msgid "Bus Stop"
+msgstr "バス停"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
+#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#: build/trans_presets.java:1580
+msgid "Edit Bus Stop"
+msgstr "バス停の編集"
+
+#. item "Public Transport/Bus Stop" combo "Shelter"
+#. item "Tourism/Shelter"
+#. item "Amenities/Hunting Stand" combo "Shelter"
+#: build/trans_presets.java:1585 build/trans_presets.java:2011
+#: build/trans_presets.java:2813
+msgid "Shelter"
+msgstr "避難所"
+
+#. item "Public Transport/Bus Stop" combo "Bench"
+#. <key key="amenity" value="waste_basket" />
+#. item "Amenities/Bench"
+#: build/trans_presets.java:1586 build/trans_presets.java:2801
+msgid "Bench"
+msgstr "ベンチ"
+
+#. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#: build/trans_presets.java:1587
+msgid "Tactile Paving"
+msgstr "点字ブロック"
+
+#. </optional>
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1591
+msgid "Bus Platform"
+msgstr "バス乗り場"
+
+#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
+#: build/trans_presets.java:1592
+msgid "Edit Bus Platform"
+msgstr "バス乗り場の編集"
+
+#. <separator/>
+#. item "Public Transport/Taxi"
+#: build/trans_presets.java:1600
+msgid "Taxi"
+msgstr "タクシー"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
+#. item "Public Transport/Taxi" label "Edit Taxi station"
+#: build/trans_presets.java:1602
+msgid "Edit Taxi station"
+msgstr "タクシー乗り場の編集"
+
+#. <separator/>
+#. group "Airport"
+#: build/trans_presets.java:1608
+msgid "Airport"
+msgstr "空港"
+
+#. item "Airport/Airport Ground"
+#: build/trans_presets.java:1609
+msgid "Airport Ground"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#: build/trans_presets.java:1611
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. <optional>
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1615
+msgid "IATA"
+msgstr "IATA"
+
+#. item "Airport/Airport Ground" text "ICAO"
+#: build/trans_presets.java:1616
+msgid "ICAO"
+msgstr "ICAO"
+
+#. </optional>
+#. <separator/>
+#. item "Airport/Runway"
+#: build/trans_presets.java:1621
+msgid "Runway"
+msgstr "滑走路"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#. item "Airport/Runway" label "Edit Runway"
+#: build/trans_presets.java:1623
+msgid "Edit Runway"
+msgstr "滑走路の編集"
+
+#. </optional>
+#. item "Airport/Taxiway"
+#: build/trans_presets.java:1629
+msgid "Taxiway"
+msgstr "誘導路"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#: build/trans_presets.java:1631
+msgid "Edit Taxiway"
+msgstr "誘導路の編集"
+
+#. </optional>
+#. item "Airport/Helipad"
+#: build/trans_presets.java:1637
+msgid "Helipad"
+msgstr "ヘリパッド"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#. item "Airport/Helipad" label "Edit Helipad"
+#: build/trans_presets.java:1639
+msgid "Edit Helipad"
+msgstr "ヘリパッドの編集"
+
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#. item "Airport/Apron" label "Apron"
+#: build/trans_presets.java:1645 build/trans_presets.java:1647
+msgid "Apron"
+msgstr "エプロン"
+
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#. item "Airport/Hangar" label "Hangar"
+#: build/trans_presets.java:1650 build/trans_presets.java:1652
+msgid "Hangar"
+msgstr "格納庫"
+
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Airport/Beacon" label "Beacon"
+#. item "Man Made/Beacon"
+#: build/trans_presets.java:1655 build/trans_presets.java:1657
+#: build/trans_presets.java:2687
+msgid "Beacon"
+msgstr "ビーコン"
+
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#. item "Airport/Windsock" label "Windsock"
+#: build/trans_presets.java:1660 build/trans_presets.java:1662
+msgid "Windsock"
+msgstr "吹き流し"
+
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#. item "Airport/Terminal"
+#: build/trans_presets.java:1666
+msgid "Terminal"
+msgstr "ターミナル"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#: build/trans_presets.java:1668
+msgid "Edit Terminal"
+msgstr "ターミナルの編集"
+
+#. item "Airport/Gate"
+#: build/trans_presets.java:1672
+msgctxt "airport"
+msgid "Gate"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#: build/trans_presets.java:1674
+msgid "Edit Terminal Gate"
+msgstr "ターミナルゲートの編集"
+
+#. group "Travel"
+#: build/trans_presets.java:1680
+msgid "Travel"
+msgstr "旅行"
+
+#. group "Travel/Accomodation"
+#: build/trans_presets.java:1681
+msgid "Accomodation"
+msgstr "宿泊施設"
+
+#. item "Travel/Accomodation/Hotel"
+#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Fuel"/>
+#. </button>
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#: build/trans_presets.java:1682 build/trans_surveyor.java:43
+msgid "Hotel"
+msgstr "ホテル"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#: build/trans_presets.java:1685
+msgid "Edit Hotel"
+msgstr "ホテルの編集"
+
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#: build/trans_presets.java:1689 build/trans_presets.java:1707
+#: build/trans_presets.java:1723 build/trans_presets.java:1740
+#: build/trans_presets.java:1758 build/trans_presets.java:1792
+#: build/trans_presets.java:1809 build/trans_presets.java:1832
+msgid "Stars"
+msgstr "星の数"
+
+#. <space />
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Bar" combo "Internet access"
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "Internet access"
+msgstr "インターネットアクセス"
+
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "wlan"
+msgstr "無線LAN"
+
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "wired"
+msgstr "有線LAN"
+
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#. color terminal
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941 build/trans_style.java:1352
+msgid "terminal"
+msgstr "駅"
+
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#: build/trans_presets.java:1692 build/trans_presets.java:1710
+#: build/trans_presets.java:1726 build/trans_presets.java:1743
+#: build/trans_presets.java:1761 build/trans_presets.java:1778
+#: build/trans_presets.java:1795 build/trans_presets.java:1812
+#: build/trans_presets.java:1835 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1890
+#: build/trans_presets.java:1909 build/trans_presets.java:1925
+#: build/trans_presets.java:1942
+msgid "Internet access fee"
+msgstr "インターネットアクセス費用"
+
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. <space />
+#. item "Food+Drinks/Nightclub" combo "Smoking"
 #: build/trans_presets.java:1693 build/trans_presets.java:1711
 #: build/trans_presets.java:1727 build/trans_presets.java:1744
@@ -25966,926 +26527,422 @@
 #: build/trans_presets.java:1910 build/trans_presets.java:1926
 #: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:3526
-msgid "Email Address"
-msgstr "Eメールアドレス"
-
-#. item "Car/Tyres" text "Email Address"
-#. item "Bicycle/Bike Dealer" text "Name"
-#: build/trans_presets.java:1435 build/trans_presets.java:1474
-#: build/trans_presets.java:1500
-msgid "Rental"
-msgstr "レンタル"
-
-#. item "Car/Rental"
-#. <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:1438
-msgid "Edit Car Rental"
-msgstr "レンタカーの編集"
-
-#: build/trans_presets.java:1445
-msgid "Sharing"
-msgstr "自家用車共有"
-
-#. item "Car/Sharing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1447
-msgid "Edit Car Sharing"
-msgstr "カーシェアリング"
-
-#. item "Motorcycle/Parking"
-#: build/trans_presets.java:1457
-msgid "Edit Motorcycle Parking"
-msgstr "バイク駐車場の編集"
-
-#. item "Motorcycle/Parking" text "Name"
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1460 build/trans_presets.java:1491
-msgid "Capacity"
-msgstr "収容台数"
-
-#: build/trans_presets.java:1464
-msgid "Motorcycle Dealer"
-msgstr "バイク店"
-
-#. item "Motorcycle/Motorcycle Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
-#: build/trans_presets.java:1466
-msgid "Edit Shop Motorcycle"
-msgstr "バイク店の編集"
-
-#: build/trans_presets.java:1472
-msgid "Services:"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1473
-msgid "Sale"
-msgstr ""
-
-#: build/trans_presets.java:1475 build/trans_presets.java:1476
-msgid "brand"
-msgstr ""
-
-#: build/trans_presets.java:1476
-msgid "Parts"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
-#. <separator/>
-#: build/trans_presets.java:1477 build/trans_presets.java:2782
-#: build/trans_presets.java:2904
-msgid "Clothes"
-msgstr "被服"
-
-#. item "Bicycle/Parking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1488
-msgid "Edit Bicycle Parking"
-msgstr "駐輪場の編集"
-
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1493
-msgid "Bike Dealer"
-msgstr "自転車屋"
-
-#. item "Bicycle/Bike Dealer"
-#. <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:1496
-msgid "Edit Bicycle Shop"
-msgstr "自転車ショップの編集"
-
-#. item "Bicycle/Rental"
-#. <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:1503
-msgid "Edit Bicycle Rental"
-msgstr "自転車レンタルの編集"
-
-#. group "Public Transport"
-#: build/trans_presets.java:1509
-msgctxt "railway"
-msgid "Station"
-msgstr "駅"
-
-#. item "Public Transport/Station"
-#. <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:1512
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "駅の編集"
-
-#. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1517
-msgid "UIC-Reference"
-msgstr "UIC-Reference"
-
-#. item "Public Transport/Station" text "UIC-Reference"
-#. </optional>
-#: build/trans_presets.java:1520
-msgid "Railway Halt"
-msgstr "停車場"
-
-#. item "Public Transport/Railway Halt"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1522
-msgid "Edit Halt"
-msgstr "停止線の編集"
-
-#. item "Public Transport/Railway Halt" text "Name"
-#. </optional>
-#: build/trans_presets.java:1529
-msgid "Tram Stop"
-msgstr "トラム停車場"
-
-#. item "Public Transport/Tram Stop"
-#. <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:1532
-msgid "Edit Tram Stop"
-msgstr "トラム停車場の編集"
-
-#. item "Public Transport/Tram Stop" text "Name"
-#. </optional>
-#: build/trans_presets.java:1539
-msgid "Railway Platform"
-msgstr "鉄道のプラットホーム"
-
-#. item "Public Transport/Railway Platform"
-#. <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:1542
-msgid "Edit Railway Platform"
-msgstr "鉄道のプラットホームの編集"
-
-#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#. <key key="railway" value="platform" />
-#. <space />
-#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#. <key key="highway" value="platform" />
-#. <space />
-#: build/trans_presets.java:1545 build/trans_presets.java:1590
-msgid "Reference (track number)"
-msgstr "リファレンス (ホームの番号)"
-
-#. item "Public Transport/Railway Platform" text "Width (meters)"
-#. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1547 build/trans_presets.java:1592
-msgid "Area"
-msgstr "エリア"
-
-#. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1549
-msgid "Subway Entrance"
-msgstr "地下鉄の入口"
-
-#. item "Public Transport/Subway Entrance"
-#. <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:1552
-msgid "Edit Subway Entrance"
-msgstr "地下鉄入口の編集"
-
-#. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1557 build/trans_presets.java:2754
-msgid "Wheelchair"
-msgstr "車いす"
-
-#. item "Public Transport/Subway Entrance" check "Bicycle"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1562
-msgid "Bus Station"
-msgstr "バスターミナル"
-
-#. item "Public Transport/Bus Station"
-#. <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:1565
-msgid "Edit Bus Station"
-msgstr "バスターミナルの編集"
-
-#. item "Public Transport/Bus Station" text "Name"
-#. </optional>
-#: build/trans_presets.java:1571
-msgid "Bus Stop"
-msgstr "バス停"
-
-#. item "Public Transport/Bus Stop"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
-#. 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:1575
-msgid "Edit Bus Stop"
-msgstr "バス停の編集"
-
-#. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1580 build/trans_presets.java:2003
-#: build/trans_presets.java:2804
-msgid "Shelter"
-msgstr "避難所"
-
-#. item "Amenities/Waste Basket" label "Edit Waste Basket"
-#. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1581 build/trans_presets.java:2792
-msgid "Bench"
-msgstr "ベンチ"
-
-#: build/trans_presets.java:1582
-msgid "Tactile Paving"
-msgstr "点字ブロック"
-
-#. </optional>
-#: build/trans_presets.java:1586
-msgid "Bus Platform"
-msgstr "バス乗り場"
-
-#. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1587
-msgid "Edit Bus Platform"
-msgstr "バス乗り場の編集"
-
-#. item "Public Transport/Bus Platform" check "Area"
-#. <separator/>
-#: build/trans_presets.java:1595
-msgid "Taxi"
-msgstr "タクシー"
-
-#. item "Public Transport/Taxi"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1597
-msgid "Edit Taxi station"
-msgstr "タクシー乗り場の編集"
-
-#. item "Public Transport/Taxi" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1603
-msgid "Airport"
-msgstr "空港"
-
-#. group "Airport"
-#: build/trans_presets.java:1604
-msgid "Airport Ground"
-msgstr ""
-
-#. item "Airport/Airport Ground"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1606
-msgid "Edit Airport Ground"
-msgstr ""
-
-#. item "Airport/Airport Ground" text "Name"
-#. <optional>
-#: build/trans_presets.java:1610
-msgid "IATA"
-msgstr "IATA"
-
-#. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1611
-msgid "ICAO"
-msgstr "ICAO"
-
-#. item "Airport/Airport Ground" text "ICAO"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1615
-msgid "Runway"
-msgstr "滑走路"
-
-#. item "Airport/Runway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1617
-msgid "Edit Runway"
-msgstr "滑走路の編集"
-
-#. item "Airport/Runway" text "Reference"
-#. </optional>
-#: build/trans_presets.java:1623
-msgid "Taxiway"
-msgstr "誘導路"
-
-#. item "Airport/Taxiway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1625
-msgid "Edit Taxiway"
-msgstr "誘導路の編集"
-
-#. item "Airport/Taxiway" text "Reference"
-#. </optional>
-#: build/trans_presets.java:1631
-msgid "Helipad"
-msgstr "ヘリパッド"
-
-#. item "Airport/Helipad"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1633
-msgid "Edit Helipad"
-msgstr "ヘリパッドの編集"
-
-#. item "Airport/Helipad" text "Reference"
-#. </optional>
-#. item "Airport/Apron"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1639 build/trans_presets.java:1641
-msgid "Apron"
-msgstr "エプロン"
-
-#. item "Airport/Apron" label "Apron"
-#. <key key="aeroway" value="apron" />
-#. item "Airport/Hangar"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1644 build/trans_presets.java:1646
-msgid "Hangar"
-msgstr "格納庫"
-
-#. item "Airport/Hangar" label "Hangar"
-#. <key key="building" value="hangar" />
-#. item "Airport/Beacon"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1649 build/trans_presets.java:1651
-#: build/trans_presets.java:2678
-msgid "Beacon"
-msgstr "ビーコン"
-
-#. item "Airport/Beacon" label "Beacon"
-#. <key key="man_made" value="beacon" />
-#. item "Airport/Windsock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1654 build/trans_presets.java:1656
-msgid "Windsock"
-msgstr "吹き流し"
-
-#. item "Airport/Windsock" label "Windsock"
-#. <key key="aeroway" value="windsock" />
-#. <separator/>
-#: build/trans_presets.java:1660
-msgid "Terminal"
-msgstr "ターミナル"
-
-#. item "Airport/Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1662
-msgid "Edit Terminal"
-msgstr "ターミナルの編集"
-
-#. item "Airport/Gate"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1668
-msgid "Edit Terminal Gate"
-msgstr "ターミナルゲートの編集"
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1674
-msgid "Travel"
-msgstr "旅行"
-
-#. group "Travel"
-#: build/trans_presets.java:1675
-msgid "Accomodation"
-msgstr "宿泊施設"
-
-#. group "Travel/Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
-#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
-#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
-#. <action class="SetWaypointAction" params="Fuel"/>
-#. </button>
-#: build/trans_presets.java:1676 build/trans_surveyor.java:43
-msgid "Hotel"
-msgstr "ホテル"
-
-#. item "Travel/Accomodation/Hotel"
-#. <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:1679
-msgid "Edit Hotel"
-msgstr "ホテルの編集"
-
-#. item "Travel/Accomodation/Hotel" text "Operator"
-#. item "Travel/Accomodation/Motel" text "Operator"
-#. item "Travel/Accomodation/Guest House" text "Name"
-#. item "Travel/Accomodation/Chalet" text "Name"
-#. item "Travel/Accomodation/Hostel" text "Operator"
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1683 build/trans_presets.java:1701
-#: build/trans_presets.java:1717 build/trans_presets.java:1734
-#: build/trans_presets.java:1752 build/trans_presets.java:1786
-#: build/trans_presets.java:1803 build/trans_presets.java:1826
-msgid "Stars"
-msgstr "星の数"
-
-#. item "Travel/Accomodation/Hotel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Motel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Guest House" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Chalet" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Hostel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#. <space />
-#. item "Travel/Accomodation/Caravan Site" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Camping Site" combo "Stars"
-#. <space />
-#. item "Food+Drinks/Restaurant" combo "Stars"
-#. <space />
-#: build/trans_presets.java:1685 build/trans_presets.java:1703
-#: build/trans_presets.java:1719 build/trans_presets.java:1736
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1828 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1883
-#: build/trans_presets.java:1902 build/trans_presets.java:1918
-#: build/trans_presets.java:1935
-msgid "Internet access"
-msgstr "インターネットアクセス"
-
-#: build/trans_presets.java:1685 build/trans_presets.java:1703
-#: build/trans_presets.java:1719 build/trans_presets.java:1736
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1828 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1883
-#: build/trans_presets.java:1902 build/trans_presets.java:1918
-#: build/trans_presets.java:1935
-msgid "wlan"
-msgstr "無線LAN"
-
-#: build/trans_presets.java:1685 build/trans_presets.java:1703
-#: build/trans_presets.java:1719 build/trans_presets.java:1736
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1828 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1883
-#: build/trans_presets.java:1902 build/trans_presets.java:1918
-#: build/trans_presets.java:1935
-msgid "wired"
-msgstr "有線LAN"
-
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1685 build/trans_presets.java:1703
-#: build/trans_presets.java:1719 build/trans_presets.java:1736
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1828 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1883
-#: build/trans_presets.java:1902 build/trans_presets.java:1918
-#: build/trans_presets.java:1935 build/trans_style.java:1352
-msgid "terminal"
-msgstr "駅"
-
-#: build/trans_presets.java:1686 build/trans_presets.java:1704
-#: build/trans_presets.java:1720 build/trans_presets.java:1737
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1789 build/trans_presets.java:1806
-#: build/trans_presets.java:1829 build/trans_presets.java:1848
-#: build/trans_presets.java:1865 build/trans_presets.java:1884
-#: build/trans_presets.java:1903 build/trans_presets.java:1919
-#: build/trans_presets.java:1936
-msgid "Internet access fee"
-msgstr "インターネットアクセス費用"
-
-#. <space />
-#: build/trans_presets.java:1687 build/trans_presets.java:1705
-#: build/trans_presets.java:1721 build/trans_presets.java:1738
-#: build/trans_presets.java:1756 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1830 build/trans_presets.java:1849
-#: build/trans_presets.java:1866 build/trans_presets.java:1885
-#: build/trans_presets.java:1904 build/trans_presets.java:1920
-#: build/trans_presets.java:1937 build/trans_presets.java:1952
 msgid "Smoking"
 msgstr "喫煙"
 
-#: build/trans_presets.java:1687 build/trans_presets.java:1705
-#: build/trans_presets.java:1721 build/trans_presets.java:1738
-#: build/trans_presets.java:1756 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1830 build/trans_presets.java:1849
-#: build/trans_presets.java:1866 build/trans_presets.java:1885
-#: build/trans_presets.java:1904 build/trans_presets.java:1920
-#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1687 build/trans_presets.java:1705
-#: build/trans_presets.java:1721 build/trans_presets.java:1738
-#: build/trans_presets.java:1756 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1830 build/trans_presets.java:1849
-#: build/trans_presets.java:1866 build/trans_presets.java:1885
-#: build/trans_presets.java:1904 build/trans_presets.java:1920
-#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1687 build/trans_presets.java:1705
-#: build/trans_presets.java:1721 build/trans_presets.java:1738
-#: build/trans_presets.java:1756 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1830 build/trans_presets.java:1849
-#: build/trans_presets.java:1866 build/trans_presets.java:1885
-#: build/trans_presets.java:1904 build/trans_presets.java:1920
-#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "isolated"
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1695
+#. item "Travel/Accomodation/Motel"
+#: build/trans_presets.java:1701
 msgid "Motel"
 msgstr "モーテル"
 
-#. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1697
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#: build/trans_presets.java:1703
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
-#. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1713
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1719
 msgid "Guest House"
 msgstr "ゲストハウス"
 
-#. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1714
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#: build/trans_presets.java:1720
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
-#. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1729
+#. item "Travel/Accomodation/Chalet"
+#: build/trans_presets.java:1735
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
 
-#. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1731
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#: build/trans_presets.java:1737
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
-#. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1746
+#. item "Travel/Accomodation/Hostel"
+#: build/trans_presets.java:1752
 msgid "Hostel"
 msgstr "ホステル"
 
-#. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1748
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#: build/trans_presets.java:1754
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
-#. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1764
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1770
 msgid "Alpine Hut"
 msgstr "山小屋"
 
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1765
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#: build/trans_presets.java:1771
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
 #. <separator/>
-#: build/trans_presets.java:1782
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1788
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1783
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#: build/trans_presets.java:1789
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
-#. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1798
+#. item "Travel/Accomodation/Camping Site"
+#: build/trans_presets.java:1804
 msgid "Camping Site"
 msgstr "キャンプ場"
 
-#. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1800
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#: build/trans_presets.java:1806
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
-#. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1816
+#. group "Food+Drinks"
+#: build/trans_presets.java:1822
 msgid "Food+Drinks"
 msgstr "飲食店"
 
-#. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#. item "Food+Drinks/Restaurant"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1817 build/trans_surveyor.java:47
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
+#: build/trans_presets.java:1823 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
 
-#. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1819
+#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#: build/trans_presets.java:1825
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
 
-#. item "Food+Drinks/Restaurant" text "Operator"
-#. item "Food+Drinks/Fast Food" text "Operator"
-#. item "Food+Drinks/Cafe" text "Operator"
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
-#: build/trans_presets.java:1880
+#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Fast Food" combo "Cuisine"
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
+#: build/trans_presets.java:1886
 msgid "Cuisine"
 msgstr "料理の種類"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine"
-#. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "sushi"
 msgstr "寿司"
 
-#. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1824 build/trans_presets.java:1899
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1830 build/trans_presets.java:1905
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1838
+#. item "Food+Drinks/Fast Food"
+#: build/trans_presets.java:1844
 msgid "Fast Food"
 msgstr "ファーストフード"
 
-#. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1840
+#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#: build/trans_presets.java:1846
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1850
 msgid "fish_and_chips"
 msgstr "フィッシュ・アンド・チップス"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1850
 msgid "chicken"
 msgstr "チキン"
 
-#. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1857
+#. item "Food+Drinks/Food Court"
+#: build/trans_presets.java:1863
 msgid "Food Court"
 msgstr "フードコート"
 
-#. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1859
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#: build/trans_presets.java:1865
 msgid "Edit Food Court"
 msgstr "フードコードを編集"
 
-#. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1874
+#. item "Food+Drinks/Cafe"
+#: build/trans_presets.java:1880
 msgid "Cafe"
 msgstr "カフェ"
 
-#. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1876
+#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#: build/trans_presets.java:1882
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "ice_cream"
 msgstr "アイスクリーム"
 
-#. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1893
+#. item "Food+Drinks/Pub"
+#: build/trans_presets.java:1899
 msgid "Pub"
 msgstr "パブ、居酒屋"
 
-#. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1895
+#. item "Food+Drinks/Pub" label "Edit Pub"
+#: build/trans_presets.java:1901
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1912
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1918
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
-#. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1913
+#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#: build/trans_presets.java:1919
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1928
+#. item "Food+Drinks/Bar"
+#: build/trans_presets.java:1934
 msgid "Bar"
 msgstr "バー"
 
-#. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1930
+#. item "Food+Drinks/Bar" label "Edit Bar"
+#: build/trans_presets.java:1936
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1945
+#. item "Food+Drinks/Nightclub"
+#: build/trans_presets.java:1951
 msgid "Nightclub"
 msgstr "ナイトクラブ"
 
-#. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1947
+#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#: build/trans_presets.java:1953
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1961
+#. group "Tourism"
+#: build/trans_presets.java:1967
 msgid "Tourism"
 msgstr "旅行"
 
-#. group "Tourism"
-#: build/trans_presets.java:1962
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1968
 msgid "Attraction"
 msgstr "アトラクション"
 
-#. item "Tourism/Attraction"
-#: build/trans_presets.java:1963
+#. item "Tourism/Attraction" label "Edit Attraction"
+#: build/trans_presets.java:1969
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
-#. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1968
+#. item "Tourism/Museum"
+#: build/trans_presets.java:1974
 msgid "Museum"
 msgstr "博物館"
 
-#. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1970
+#. item "Tourism/Museum" label "Edit Museum"
+#: build/trans_presets.java:1976
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1975
+#. item "Tourism/Zoo"
+#: build/trans_presets.java:1982
 msgid "Zoo"
 msgstr "動物園"
 
-#. item "Tourism/Zoo"
 #. <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:1978
+#. item "Tourism/Zoo" label "Edit Zoo"
+#: build/trans_presets.java:1985
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1983
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1991
 msgid "Theme Park"
 msgstr "テーマパーク"
 
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1984
+#. item "Tourism/Theme Park" label "Edit Theme Park"
+#: build/trans_presets.java:1992
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1989
+#. item "Tourism/Artwork"
+#: build/trans_presets.java:1997
 msgid "Artwork"
 msgstr "美術館"
 
-#. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1991
+#. item "Tourism/Artwork" label "Edit Artwork"
+#: build/trans_presets.java:1999
 msgid "Edit Artwork"
 msgstr "美術館の編集"
 
-#. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1996
+#. item "Tourism/Viewpoint"
+#: build/trans_presets.java:2004
 msgid "Viewpoint"
 msgstr "観覧台"
 
-#. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1998
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#: build/trans_presets.java:2006
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:2001
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:2009
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:2004
+#. item "Tourism/Shelter" label "Edit Shelter"
+#: build/trans_presets.java:2012
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
 
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#. item "Tourism/Shelter" check "Fireplace"
+#. item "Tourism/Picnic Site" check "Fireplace"
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
 msgid "Fireplace"
 msgstr "野外炉"
 
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2017
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2010
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#: build/trans_presets.java:2018
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
-#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:2016
+#. item "Tourism/Information Office"
+#: build/trans_presets.java:2024
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:2023
+#. item "Tourism/Map"
+#: build/trans_presets.java:2031
 msgid "Map"
 msgstr "マップ"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:2028
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:2036
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
-#. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2036
 msgid "topo"
 msgstr "地形"
 
-#. color tertiary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -26895,5 +26952,5 @@
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
-#. color deprecated
+#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -26903,5 +26960,5 @@
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
-#. color highway_track
+#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -26919,5 +26976,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:2028 build/trans_style.java:625
+#. color street
+#: build/trans_presets.java:2036 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26925,330 +26983,326 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2036
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:2029
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:2037
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
-#. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "region"
 msgstr "地方"
 
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2094
+#. item "Tourism/Map" text "Closer Description"
+#. item "Tourism/Information Board" text "Closer Description"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2038 build/trans_presets.java:2054
+#: build/trans_presets.java:2102
 msgid "Closer Description"
 msgstr "詳細な説明"
 
-#. item "Tourism/Map" text "Closer Description"
 #. <space />
-#. item "Tourism/Guidepost" text "Elevation"
+#. item "Tourism/Map" label "Routes shown for:"
 #. <space />
-#: build/trans_presets.java:2032 build/trans_presets.java:2055
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:2040 build/trans_presets.java:2063
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
 
-#. item "Tourism/Map" label "Routes shown for:"
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2033 build/trans_presets.java:2056
+#. item "Tourism/Map" check "Hiking"
+#. item "Tourism/Guidepost" check "Hiking"
+#: build/trans_presets.java:2041 build/trans_presets.java:2064
 msgid "Hiking"
 msgstr "ハイキング"
 
-#. item "Tourism/Map" check "Hiking"
-#. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2034 build/trans_presets.java:2057
-#: build/trans_presets.java:2266
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#. item "Sport/Cycling"
+#: build/trans_presets.java:2042 build/trans_presets.java:2065
+#: build/trans_presets.java:2275
 msgid "Cycling"
 msgstr "サイクリング"
 
-#. item "Tourism/Map" check "Cycling"
-#. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:2035 build/trans_presets.java:2058
+#. item "Tourism/Map" check "Mountainbiking"
+#. item "Tourism/Guidepost" check "Mountainbiking"
+#: build/trans_presets.java:2043 build/trans_presets.java:2066
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
 
-#. item "Tourism/Map" check "Mountainbiking"
-#. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2036 build/trans_presets.java:2059
-#: build/trans_presets.java:2314
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#. item "Sport/Skiing"
+#: build/trans_presets.java:2044 build/trans_presets.java:2067
+#: build/trans_presets.java:2323
 msgid "Skiing"
 msgstr "スキー"
 
-#. item "Tourism/Map" check "Skiing"
-#. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:2037 build/trans_presets.java:2060
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:2045 build/trans_presets.java:2068
 msgid "Riding"
 msgstr "乗馬"
 
-#. item "Tourism/Map" check "Riding"
-#. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2038 build/trans_presets.java:2061
+#. item "Tourism/Map" label "... other transportation modes possible"
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:2046 build/trans_presets.java:2069
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
-#. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:2040
+#. item "Tourism/Information Board"
+#: build/trans_presets.java:2048
 msgid "Information Board"
 msgstr "情報板"
 
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:2045
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:2053
 msgid "Board Content"
 msgstr "掲示板の内容"
 
-#. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "plants"
 msgstr "植物"
 
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:2048
+#. item "Tourism/Guidepost"
+#: build/trans_presets.java:2056
 msgid "Guidepost"
 msgstr "道しるべ"
 
-#. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2063
+#. item "Tourism/Flagpole"
+#: build/trans_presets.java:2071
 msgid "Flagpole"
 msgstr ""
 
-#. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:2067
+#. item "Tourism/Information Terminal"
+#: build/trans_presets.java:2075
 msgid "Information Terminal"
 msgstr "情報端末"
 
-#. item "Tourism/Information Terminal" text "Name"
-#. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:2072 build/trans_presets.java:2082
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
+#: build/trans_presets.java:2080 build/trans_presets.java:2090
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:2077
+#. item "Tourism/Audioguide"
+#: build/trans_presets.java:2085
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:2087
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:2095
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
-#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2088
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:2096
 msgid "Phone number"
 msgstr "電話番号"
 
-#. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2090
+#. item "Tourism/Other Information Points"
+#: build/trans_presets.java:2098
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
-#. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2097
+#. group "Historic Places"
+#: build/trans_presets.java:2105
 msgid "Historic Places"
 msgstr "史跡"
 
-#. group "Historic Places"
-#: build/trans_presets.java:2098
+#. item "Historic Places/Castle"
+#: build/trans_presets.java:2106
 msgid "Castle"
 msgstr "城"
 
-#. item "Historic Places/Castle"
 #. <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:2101
+#. item "Historic Places/Castle" label "Edit Castle"
+#: build/trans_presets.java:2109
 msgid "Edit Castle"
 msgstr "城の編集"
 
-#. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2105
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:2114
 msgid "Ruins"
 msgstr "遺跡"
 
-#. item "Historic Places/Ruins"
-#: build/trans_presets.java:2106
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#: build/trans_presets.java:2115
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:2111
+#. item "Historic Places/Archaeological Site"
+#: build/trans_presets.java:2120
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
 
-#. item "Historic Places/Archaeological Site"
 #. <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:2114
+#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#: build/trans_presets.java:2123
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:2119
+#. item "Historic Places/Battlefield"
+#: build/trans_presets.java:2128
 msgid "Battlefield"
 msgstr "戦場跡"
 
-#. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2121
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#: build/trans_presets.java:2130
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2125
+#. item "Historic Places/Palaeontological Site"
+#: build/trans_presets.java:2134
 msgid "Palaeontological Site"
 msgstr "化石サイト"
 
-#. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2127
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#: build/trans_presets.java:2136
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
 
-#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2132
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:2141
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
-#. item "Historic Places/Monument"
-#: build/trans_presets.java:2133
+#. item "Historic Places/Monument" label "Edit Monument"
+#: build/trans_presets.java:2142
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
-#. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2137
+#. item "Historic Places/Memorial"
+#: build/trans_presets.java:2146
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
 
-#. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2139
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#: build/trans_presets.java:2148
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
-#. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2143
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:2152
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
-#. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2144
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#: build/trans_presets.java:2153
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
-#. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2148
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:2157
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
-#. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2149
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#: build/trans_presets.java:2158
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
-#. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2153
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:2162
 msgid "Boundary Stone"
 msgstr "境界石"
 
-#. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2154
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#: build/trans_presets.java:2163
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
-#. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2159
+#. group "Leisure"
+#: build/trans_presets.java:2168
 msgid "Leisure"
 msgstr "レジャー"
 
-#. group "Leisure"
-#: build/trans_presets.java:2160
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:2169
 msgid "Water Park"
 msgstr "遊泳用プール"
 
-#. item "Leisure/Water Park"
-#: build/trans_presets.java:2161
+#. item "Leisure/Water Park" label "Edit Water Park"
+#: build/trans_presets.java:2170
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
-#. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2165
+#. item "Leisure/Playground"
+#: build/trans_presets.java:2174
 msgid "Playground"
 msgstr "遊び場"
 
-#. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2167
+#. item "Leisure/Playground" label "Edit Playground"
+#: build/trans_presets.java:2176
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
-#. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2171
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:2180
 msgid "Fishing"
 msgstr "つり"
 
-#. item "Leisure/Fishing"
-#: build/trans_presets.java:2172
+#. item "Leisure/Fishing" label "Edit Fishing"
+#: build/trans_presets.java:2181
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
-#. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2178 build/trans_presets.java:2923
+#. group "Sports"
+#. item "Shops/Sports"
+#: build/trans_presets.java:2187 build/trans_presets.java:2932
 msgid "Sports"
 msgstr "スポーツ"
 
-#. group "Sports"
-#: build/trans_presets.java:2179
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:2188
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
-#. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2180
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:2189
 msgid "Stadium"
 msgstr "スタジアム"
 
-#. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2181
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#: build/trans_presets.java:2190
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
 
-#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <space />
-#. item "Sports/Sport Facilities/Sports Centre" text "Name"
-#. <space />
-#. item "Sports/Sport Facilities/Pitch" text "Name"
-#. <space />
-#. item "Sports/Sport Facilities/Racetrack" text "Name"
-#. <space />
-#: build/trans_presets.java:2185 build/trans_presets.java:2194
-#: build/trans_presets.java:2203 build/trans_presets.java:2212
-msgid "select sport:"
-msgstr "スポーツ選択："
-
 #. item "Sports/Sport Facilities/Stadium" label "select sport:"
 #. <space />
@@ -27258,6 +27312,17 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
+#: build/trans_presets.java:2194 build/trans_presets.java:2203
+#: build/trans_presets.java:2212 build/trans_presets.java:2221
+msgid "select sport:"
+msgstr "スポーツ選択："
+
 #. <space />
-#. color boundary
+#. item "Sports/Sport Facilities/Stadium" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Racetrack" combo "sport"
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -27486,5 +27551,5 @@
 #. <condition k="sport" v="karting"/>
 #. color sport
-#. <icon src="sport/karting.png"/>
+#. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27677,6 +27742,7 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#. color sport
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 #: build/trans_style.java:3770 build/trans_style.java:3778
 #: build/trans_style.java:3786 build/trans_style.java:3794
@@ -27708,311 +27774,248 @@
 msgstr "スポーツ"
 
-#. item "Sports/Sport Facilities/Stadium" combo "sport"
-#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
-#. item "Sports/Sport Facilities/Pitch" combo "sport"
-#. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "american_football"
 msgstr "アメリカンフットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "canadian_football"
 msgstr "カナディアンフットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "gaelic_football"
 msgstr "ゲーリックフットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "rugby_league"
 msgstr "ラグビーリーグ"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "rugby_union"
 msgstr "(通常の)ラグビー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:2189
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:2198
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
-#. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2190
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#: build/trans_presets.java:2199
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:2198
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:2207
 msgid "Pitch"
 msgstr "運動場"
 
-#. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2199
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#: build/trans_presets.java:2208
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:2207
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:2216
 msgid "Racetrack"
 msgstr "競技トラック"
 
-#. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2208
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#: build/trans_presets.java:2217
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:2216
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:2225
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
-#. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2217
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#: build/trans_presets.java:2226
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:2222
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:2231
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
-#. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2223
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#: build/trans_presets.java:2232
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:2229
+#. group "Sport"
+#: build/trans_presets.java:2238
 msgid "Sport"
 msgstr "スポーツ"
 
-#. group "Sport"
-#: build/trans_presets.java:2230
+#. item "Sport/Multi"
+#: build/trans_presets.java:2239
 msgid "Multi"
 msgstr "多目的"
 
-#. item "Sport/Multi"
-#: build/trans_presets.java:2231
+#. item "Sport/Multi" label "Edit Multi"
+#: build/trans_presets.java:2240
 msgid "Edit Multi"
 msgstr "Multiの編集"
-
-#. item "Sport/Multi" text "Name"
-#. item "Sport/10pin" text "Name"
-#. item "Sport/Athletics" text "Name"
-#. item "Sport/Archery" text "Name"
-#. item "Sport/Climbing" text "Name"
-#. item "Sport/Canoeing" text "Name"
-#. item "Sport/Cycling" text "Name"
-#. item "Sport/Dog Racing" text "Name"
-#. item "Sport/Equestrian" text "Name"
-#. item "Sport/Horse Racing" text "Name"
-#. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Skating" text "Name"
-#. item "Sport/Skateboard" text "Name"
-#. item "Sport/Swimming" text "Name"
-#. item "Sport/Shooting" text "Name"
-#. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Australian Football" text "Name"
-#. item "Sport (Ball)/American Football" text "Name"
-#. item "Sport (Ball)/Canadian Football" text "Name"
-#. item "Sport (Ball)/Gaelic Football" text "Name"
-#. item "Sport (Ball)/Rugby League" text "Name"
-#. item "Sport (Ball)/Rugby Union" text "Name"
-#. item "Sport (Ball)/Baseball" text "Name"
-#. item "Sport (Ball)/Basketball" text "Name"
-#. item "Sport (Ball)/Golf" text "Name"
-#. item "Sport (Ball)/Boule" text "Name"
-#. item "Sport (Ball)/Bowls" text "Name"
-#. item "Sport (Ball)/Cricket" text "Name"
-#. item "Sport (Ball)/Cricket Nets" text "Name"
-#. item "Sport (Ball)/Croquet" text "Name"
-#. item "Sport (Ball)/Hockey" text "Name"
-#. item "Sport (Ball)/Pelota" text "Name"
-#. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Table Tennis" text "Name"
-#. item "Sport (Ball)/Tennis" text "Name"
-#. item "Motorsport/Motorsport" text "Name"
-#. item "Motorsport/Karting" text "Name"
-#. item "Motorsport/Motocross" text "Name"
-#. item "Motorsport/Safety Training" text "Name"
-#. item "Motorsport/Model Aerodrome" text "Name"
-#. item "Motorsport/RC Car" text "Name"
-#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
-#: build/trans_presets.java:2282 build/trans_presets.java:2288
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2360 build/trans_presets.java:2366
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2390
-#: build/trans_presets.java:2396 build/trans_presets.java:2402
-#: build/trans_presets.java:2408 build/trans_presets.java:2414
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
-msgid "type"
-msgstr "タイプ"
 
 #. item "Sport/Multi" combo "type"
@@ -28041,4 +28044,5 @@
 #. item "Sport (Ball)/Baseball" combo "type"
 #. item "Sport (Ball)/Basketball" combo "type"
+#. item "Sport (Ball)/Golf" combo "type"
 #. item "Sport (Ball)/Boule" combo "type"
 #. item "Sport (Ball)/Bowls" combo "type"
@@ -28057,1375 +28061,1436 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
-#: build/trans_presets.java:2282 build/trans_presets.java:2288
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2360 build/trans_presets.java:2366
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2390
-#: build/trans_presets.java:2396 build/trans_presets.java:2402
-#: build/trans_presets.java:2408 build/trans_presets.java:2414
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+msgid "type"
+msgstr "タイプ"
+
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
-#: build/trans_presets.java:2282 build/trans_presets.java:2288
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2360 build/trans_presets.java:2366
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2390
-#: build/trans_presets.java:2396 build/trans_presets.java:2402
-#: build/trans_presets.java:2408 build/trans_presets.java:2414
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
-#: build/trans_presets.java:2282 build/trans_presets.java:2288
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2360 build/trans_presets.java:2366
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2390
-#: build/trans_presets.java:2396 build/trans_presets.java:2402
-#: build/trans_presets.java:2408 build/trans_presets.java:2414
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
-#: build/trans_presets.java:2282 build/trans_presets.java:2288
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2360 build/trans_presets.java:2366
-#: build/trans_presets.java:2372 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2390
-#: build/trans_presets.java:2396 build/trans_presets.java:2402
-#: build/trans_presets.java:2408 build/trans_presets.java:2414
-#: build/trans_presets.java:2420 build/trans_presets.java:2426
-#: build/trans_presets.java:2432 build/trans_presets.java:2438
-#: build/trans_presets.java:2444 build/trans_presets.java:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:2236
+#. item "Sport/10pin"
+#: build/trans_presets.java:2245
 msgid "10pin"
 msgstr "テンピンズ"
 
-#. item "Sport/10pin"
-#: build/trans_presets.java:2237
+#. item "Sport/10pin" label "Edit 10pin"
+#: build/trans_presets.java:2246
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:2242
+#. item "Sport/Athletics"
+#: build/trans_presets.java:2251
 msgid "Athletics"
 msgstr "アスレチック"
 
-#. item "Sport/Athletics"
-#: build/trans_presets.java:2243
+#. item "Sport/Athletics" label "Edit Athletics"
+#: build/trans_presets.java:2252
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:2248
+#. item "Sport/Archery"
+#: build/trans_presets.java:2257
 msgid "Archery"
 msgstr "アーチェリー"
 
-#. item "Sport/Archery"
-#: build/trans_presets.java:2249
+#. item "Sport/Archery" label "Edit Archery"
+#: build/trans_presets.java:2258
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:2254
+#. item "Sport/Climbing"
+#: build/trans_presets.java:2263
 msgid "Climbing"
 msgstr "登山"
 
-#. item "Sport/Climbing"
-#: build/trans_presets.java:2255
+#. item "Sport/Climbing" label "Edit Climbing"
+#: build/trans_presets.java:2264
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:2260
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:2269
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:2261
+#. item "Sport/Canoeing" label "Edit Canoeing"
+#: build/trans_presets.java:2270
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#. item "Sport/Cycling"
-#: build/trans_presets.java:2267
+#. item "Sport/Cycling" label "Edit Cycling"
+#: build/trans_presets.java:2276
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:2272
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:2281
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:2273
+#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#: build/trans_presets.java:2282
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2278
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:2287
 msgid "Equestrian"
 msgstr "乗馬"
 
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2279
+#. item "Sport/Equestrian" label "Edit Equestrian"
+#: build/trans_presets.java:2288
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2284
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:2293
 msgid "Horse Racing"
 msgstr "競馬"
 
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2285
+#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#: build/trans_presets.java:2294
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2290
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2299
 msgid "Gymnastics"
 msgstr "体操"
 
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2291
+#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#: build/trans_presets.java:2300
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2296
+#. item "Sport/Skating"
+#: build/trans_presets.java:2305
 msgid "Skating"
 msgstr "スケート"
 
-#. item "Sport/Skating"
-#: build/trans_presets.java:2297
+#. item "Sport/Skating" label "Edit Skating"
+#: build/trans_presets.java:2306
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2302
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2311
 msgid "Skateboard"
 msgstr "スケートボード"
 
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2303
+#. item "Sport/Skateboard" label "Edit Skateboard"
+#: build/trans_presets.java:2312
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2308
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2317
 msgid "Swimming"
 msgstr "水泳"
 
-#. item "Sport/Swimming"
-#: build/trans_presets.java:2309
+#. item "Sport/Swimming" label "Edit Swimming"
+#: build/trans_presets.java:2318
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2316
+#. item "Sport/Skiing" label "Edit Skiing"
+#: build/trans_presets.java:2325
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2319
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2328
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
-#. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2320
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2329
 msgid "Difficulty"
 msgstr "難易度"
 
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2323
+#. item "Sport/Shooting"
+#: build/trans_presets.java:2332
 msgid "Shooting"
 msgstr "射撃"
 
-#. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2325
+#. item "Sport/Shooting" label "Edit Shooting"
+#: build/trans_presets.java:2334
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2331
+#. group "Sport (Ball)"
+#: build/trans_presets.java:2340
 msgid "Sport (Ball)"
 msgstr "球技"
 
-#. group "Sport (Ball)"
-#: build/trans_presets.java:2332
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2341
 msgid "Soccer"
 msgstr "サッカー"
 
-#. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2333
+#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#: build/trans_presets.java:2342
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2338
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2347
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2339
+#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#: build/trans_presets.java:2348
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2344
+#. item "Sport (Ball)/American Football"
+#: build/trans_presets.java:2353
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
-#. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2345
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#: build/trans_presets.java:2354
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
-#: build/trans_presets.java:2350
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2359
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
-#. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2351
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#: build/trans_presets.java:2360
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
-#: build/trans_presets.java:2356
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2365
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
-#. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2357
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#: build/trans_presets.java:2366
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
-#: build/trans_presets.java:2362
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2371
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
-#. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2363
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#: build/trans_presets.java:2372
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
-#: build/trans_presets.java:2368
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2377
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
-#. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2369
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#: build/trans_presets.java:2378
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
-#: build/trans_presets.java:2374
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2383
 msgid "Baseball"
 msgstr "野球"
 
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2375
+#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#: build/trans_presets.java:2384
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2380
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2389
 msgid "Basketball"
 msgstr "バスケットボール"
 
-#. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2381
+#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#: build/trans_presets.java:2390
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2386
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2395
 msgid "Golf"
 msgstr "ゴルフ"
 
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2387
+#. item "Sport (Ball)/Golf" label "Edit Golf"
+#: build/trans_presets.java:2396
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2399
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2392
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2401
 msgid "Boule"
 msgstr "ペタンク"
 
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2393
+#. item "Sport (Ball)/Boule" label "Edit Boule"
+#: build/trans_presets.java:2402
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2398
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2407
 msgid "Bowls"
 msgstr "ボーリング"
 
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2399
+#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#: build/trans_presets.java:2408
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2404
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2413
 msgid "Cricket"
 msgstr "クリケット"
 
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2405
+#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#: build/trans_presets.java:2414
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2410
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2419
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2411
+#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#: build/trans_presets.java:2420
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2416
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2425
 msgid "Croquet"
 msgstr "クロッケー"
 
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2417
+#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#: build/trans_presets.java:2426
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2422
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2431
 msgid "Hockey"
 msgstr "ホッケー"
 
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2423
+#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#: build/trans_presets.java:2432
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2428
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2437
 msgid "Pelota"
 msgstr "ペロタ"
 
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2429
+#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#: build/trans_presets.java:2438
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2434
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2443
 msgid "Racquet"
 msgstr "ラケットボール"
 
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2435
+#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#: build/trans_presets.java:2444
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2440
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2449
 msgid "Table Tennis"
 msgstr "卓球"
 
-#. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2441
+#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#: build/trans_presets.java:2450
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2446
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2455
 msgid "Tennis"
 msgstr "テニス"
 
-#. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2447
+#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#: build/trans_presets.java:2456
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. group "Motorsport"
-#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2462 build/trans_presets.java:2463
 msgid "Motorsport"
 msgstr "モータースポーツ"
 
-#. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2455
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#: build/trans_presets.java:2464
 msgid "Edit Motorsport"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2460
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2469
 msgid "Karting"
 msgstr ""
 
-#. item "Motorsport/Karting"
-#: build/trans_presets.java:2461
+#. item "Motorsport/Karting" label "Edit Karting"
+#: build/trans_presets.java:2470
 msgid "Edit Karting"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2475
 msgid "Motocross"
 msgstr "モトクロス"
 
-#. item "Motorsport/Motocross"
-#: build/trans_presets.java:2467
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#: build/trans_presets.java:2476
 msgid "Edit Motocross"
 msgstr "モトクロスの編集"
 
-#: build/trans_presets.java:2472
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2481
 msgid "Safety Training"
 msgstr ""
 
-#. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2473
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#: build/trans_presets.java:2482
 msgid "Edit Safety Training"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2479
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2488
 msgid "Model Aerodrome"
 msgstr ""
 
-#. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2480
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#: build/trans_presets.java:2489
 msgid "Edit Model Aerodrome"
 msgstr ""
 
-#: build/trans_presets.java:2485
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2494
 msgid "RC Car"
 msgstr "ラジコンカー"
 
-#. item "Motorsport/RC Car"
-#: build/trans_presets.java:2486
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#: build/trans_presets.java:2495
 msgid "Edit RC Car"
 msgstr "ラジコンカーの編集"
 
-#: build/trans_presets.java:2493
+#. group "Man-Made"
+#: build/trans_presets.java:2502
 msgid "Man-Made"
 msgstr "建造物"
 
-#. group "Man-Made/Buildings"
-#: build/trans_presets.java:2495
+#. item "Man-Made/Buildings/Building"
+#: build/trans_presets.java:2504
 msgid "Building"
 msgstr "建物"
 
-#. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2498
+#. item "Man-Made/Buildings/Public Building"
+#: build/trans_presets.java:2507
 msgid "Public Building"
 msgstr "公共の建物"
 
-#. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2500
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#: build/trans_presets.java:2509
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
-#. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2504
+#. item "Man-Made/Buildings/Town hall"
+#: build/trans_presets.java:2513
 msgid "Town hall"
 msgstr "役場"
 
-#. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2506
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#: build/trans_presets.java:2515
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
-#. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2510
+#. item "Man-Made/Buildings/Embassy"
+#: build/trans_presets.java:2519
 msgid "Embassy"
 msgstr "大使館"
 
-#. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2512
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#: build/trans_presets.java:2521
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
-#. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2516
+#. item "Man-Made/Buildings/Courthouse"
+#: build/trans_presets.java:2525
 msgid "Courthouse"
 msgstr "裁判所"
 
-#. item "Man-Made/Buildings/Courthouse"
 #. <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:2519
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#: build/trans_presets.java:2528
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
-#. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2523
+#. item "Man-Made/Buildings/Prison"
+#: build/trans_presets.java:2532
 msgid "Prison"
 msgstr "刑務所"
 
-#. item "Man-Made/Buildings/Prison"
 #. <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:2526
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#: build/trans_presets.java:2535
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
-#. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2530
+#. item "Man-Made/Buildings/Police"
+#: build/trans_presets.java:2539
 msgid "Police"
 msgstr "警察"
 
-#. item "Man-Made/Buildings/Police"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
 #. 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:2534
+#. item "Man-Made/Buildings/Police" label "Edit Police"
+#: build/trans_presets.java:2543
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
-#. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2538
+#. item "Man-Made/Buildings/Fire Station"
+#: build/trans_presets.java:2547
 msgid "Fire Station"
 msgstr "消防署"
 
-#. item "Man-Made/Buildings/Fire Station"
 #. <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:2541
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#: build/trans_presets.java:2550
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
-#. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2545
+#. item "Man-Made/Buildings/Post Office"
+#: build/trans_presets.java:2554
 msgid "Post Office"
 msgstr "郵便局"
 
-#. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2547
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#: build/trans_presets.java:2556
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
 
-#. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2553
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2562
 msgid "Kindergarten"
 msgstr "幼稚園"
 
-#. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2554
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#: build/trans_presets.java:2563
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
-#. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2558
+#. item "Man-Made/Buildings/School"
+#: build/trans_presets.java:2567
 msgid "School"
 msgstr "学校"
 
-#. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2560
+#. item "Man-Made/Buildings/School" label "Edit School"
+#: build/trans_presets.java:2569
 msgid "Edit School"
 msgstr "学校の編集"
 
-#. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2564
+#. item "Man-Made/Buildings/University"
+#: build/trans_presets.java:2573
 msgid "University"
 msgstr "大学"
 
-#. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2566
+#. item "Man-Made/Buildings/University" label "Edit University"
+#: build/trans_presets.java:2575
 msgid "Edit University"
 msgstr "大学の編集"
 
-#. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2570
+#. item "Man-Made/Buildings/College"
+#: build/trans_presets.java:2579
 msgid "College"
 msgstr "短大"
 
-#. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2572
+#. item "Man-Made/Buildings/College" label "Edit College"
+#: build/trans_presets.java:2581
 msgid "Edit College"
 msgstr "短大の編集"
 
-#. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2577
+#. item "Man-Made/Buildings/Cinema"
+#: build/trans_presets.java:2586
 msgid "Cinema"
 msgstr "映画館"
 
-#. item "Man-Made/Buildings/Cinema"
 #. <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:2580
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#: build/trans_presets.java:2589
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
-#. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2584
+#. item "Man-Made/Buildings/Library"
+#: build/trans_presets.java:2593
 msgid "Library"
 msgstr "図書館"
 
-#. item "Man-Made/Buildings/Library"
 #. <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:2587
+#. item "Man-Made/Buildings/Library" label "Edit Library"
+#: build/trans_presets.java:2596
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2592
+#. item "Man-Made/Buildings/Arts Centre"
+#: build/trans_presets.java:2601
 msgid "Arts Centre"
 msgstr "美術館"
 
-#. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2594
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#: build/trans_presets.java:2603
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
-#. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2598
+#. item "Man-Made/Buildings/Theatre"
+#: build/trans_presets.java:2607
 msgid "Theatre"
 msgstr "劇場"
 
-#. item "Man-Made/Buildings/Theatre"
 #. <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:2601
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#: build/trans_presets.java:2610
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
-#. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2605
+#. item "Man-Made/Buildings/Place of Worship"
+#: build/trans_presets.java:2614
 msgid "Place of Worship"
 msgstr "礼拝所"
 
-#. item "Man-Made/Buildings/Place of Worship"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
 #. 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:2609
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#: build/trans_presets.java:2618
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
-
-#. item "Man-Made/Buildings/Place of Worship" text "Name"
-#. item "Land use/Graveyard" text "Name"
-#. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
-msgid "Religion"
-msgstr "宗教"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Religion"
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
+msgid "Religion"
+msgstr "宗教"
+
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
-
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
-msgid "Denomination"
-msgstr "宗派"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
+msgid "Denomination"
+msgstr "宗派"
+
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "sunni"
 msgstr "スンニ派"
 
-#: build/trans_presets.java:2617
+#. group "Man Made"
+#: build/trans_presets.java:2626
 msgid "Man Made"
 msgstr "人工物"
 
-#. group "Man Made"
-#: build/trans_presets.java:2618
+#. item "Man Made/Works"
+#: build/trans_presets.java:2627
 msgid "Works"
 msgstr "工場"
 
-#. item "Man Made/Works"
-#: build/trans_presets.java:2619
+#. item "Man Made/Works" label "Edit Works"
+#: build/trans_presets.java:2628
 msgid "Edit Works"
 msgstr "工場の編集"
 
-#. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2623
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2632
 msgid "Tower"
 msgstr "タワー"
 
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2624
+#. item "Man Made/Tower" label "Edit Tower"
+#: build/trans_presets.java:2633
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
-#. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2627
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2636
 msgid "Tower type"
 msgstr "塔の種類"
 
-#. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2636
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2636
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2629
+#. item "Man Made/Tower" text "Height (meters)"
+#: build/trans_presets.java:2638
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
 
-#. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2633
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2642
 msgid "Water Tower"
 msgstr "水道塔"
 
-#. item "Man Made/Water Tower"
-#: build/trans_presets.java:2634
+#. item "Man Made/Water Tower" label "Edit Water Tower"
+#: build/trans_presets.java:2643
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
-#. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2638
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2647
 msgid "Gasometer"
 msgstr "ガスタンク"
 
-#. item "Man Made/Gasometer"
-#: build/trans_presets.java:2639
+#. item "Man Made/Gasometer" label "Edit Gasometer"
+#: build/trans_presets.java:2648
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
-#. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2643
+#. item "Man Made/Lighthouse"
+#: build/trans_presets.java:2652
 msgid "Lighthouse"
 msgstr "灯台"
 
-#. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2645
+#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#: build/trans_presets.java:2654
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
-#. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2649
+#. item "Man Made/Windmill"
+#: build/trans_presets.java:2658
 msgid "Windmill"
 msgstr "風車"
 
-#. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2651
+#. item "Man Made/Windmill" label "Edit Windmill"
+#: build/trans_presets.java:2660
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
-#. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2655
+#. item "Man Made/Pipeline"
+#: build/trans_presets.java:2664
 msgid "Pipeline"
 msgstr "パイプライン"
 
-#. item "Man Made/Pipeline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2658
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#: build/trans_presets.java:2667
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2661 build/trans_presets.java:2704
+#: build/trans_presets.java:2670 build/trans_presets.java:2713
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2662
+#. item "Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:2671
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2671
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2671
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2664
+#. item "Man Made/Wastewater Plant"
+#: build/trans_presets.java:2673
 msgid "Wastewater Plant"
 msgstr "下水処理場"
 
-#. item "Man Made/Wastewater Plant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
 #. 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:2668
+#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#: build/trans_presets.java:2677
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
-#. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2672
+#. item "Man Made/Crane"
+#: build/trans_presets.java:2681
 msgid "Crane"
 msgstr "クレーン"
 
-#. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2674
+#. item "Man Made/Crane" label "Edit Crane"
+#: build/trans_presets.java:2683
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
-#. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2680
+#. item "Man Made/Beacon" label "Edit Beacon"
+#: build/trans_presets.java:2689
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
-#. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2684
+#. item "Man Made/Survey Point"
+#: build/trans_presets.java:2693
 msgid "Survey Point"
 msgstr "調査ポイント"
 
-#. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2686
+#. item "Man Made/Survey Point" label "Edit Survey Point"
+#: build/trans_presets.java:2695
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
-#. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2690
+#. item "Man Made/Surveillance"
+#: build/trans_presets.java:2699
 msgid "Surveillance"
 msgstr "監視カメラ"
 
-#. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2692
+#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#: build/trans_presets.java:2701
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
-#. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2698
+#. item "Man Made/Power Generator"
+#: build/trans_presets.java:2707
 msgid "Power Generator"
 msgstr "発電機"
 
-#. item "Man Made/Power Generator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
 #. 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:2702
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#: build/trans_presets.java:2711
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
-#. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2707
+#. item "Man Made/Power Station"
+#: build/trans_presets.java:2716
 msgid "Power Station"
 msgstr "変電所"
 
-#. item "Man Made/Power Station"
 #. <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:2710
+#. item "Man Made/Power Station" label "Edit Power Station"
+#: build/trans_presets.java:2719
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
-#. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2716
+#. item "Man Made/Power Sub Station"
+#: build/trans_presets.java:2725
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
 
-#. item "Man Made/Power Sub Station"
 #. <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:2719
+#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#: build/trans_presets.java:2728
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
 
-#. item "Man Made/Power Sub Station" text "Operator"
-#. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2722 build/trans_presets.java:2739
+#. item "Man Made/Power Sub Station" text "Line reference"
+#. item "Man Made/Power Line" text "Line reference"
+#: build/trans_presets.java:2731 build/trans_presets.java:2748
 msgid "Line reference"
 msgstr "ライン参照"
 
-#. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2724
+#. item "Man Made/Power Tower"
+#: build/trans_presets.java:2733
 msgid "Power Tower"
 msgstr "送電塔"
 
-#. item "Man Made/Power Tower"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
 #. 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:2729
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#: build/trans_presets.java:2738
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
-#. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2739
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2739
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2731
+#. item "Man Made/Power Tower" text "Tower reference"
+#: build/trans_presets.java:2740
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
-#. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2733
+#. item "Man Made/Power Line"
+#: build/trans_presets.java:2742
 msgid "Power Line"
 msgstr "送電線"
 
-#. item "Man Made/Power Line"
 #. <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:2736
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2745
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2737
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2746
 msgid "Line type"
 msgstr "線の種類"
 
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2746
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2746
 msgctxt "Power Line"
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2742
+#. item "Man Made/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:2751
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2743
+#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:2752
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
-#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2746
+#. group "Amenities"
+#: build/trans_presets.java:2755
 msgid "Amenities"
 msgstr "各種設備"
 
-#. group "Amenities"
-#: build/trans_presets.java:2747
+#. item "Amenities/Toilets"
+#: build/trans_presets.java:2756
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2763
 msgid "limited"
 msgstr "制限"
 
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2755 build/trans_presets.java:3041
+#. item "Amenities/Toilets" text "Note"
+#. item "Shops/Vending machine" text "Note"
+#: build/trans_presets.java:2764 build/trans_presets.java:3050
 msgid "Note"
 msgstr "備考"
 
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2757
+#. item "Amenities/Post Box"
+#: build/trans_presets.java:2766
 msgid "Post Box"
 msgstr "郵便ポスト"
 
-#. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2762
+#. item "Amenities/Telephone"
+#: build/trans_presets.java:2771
 msgid "Telephone"
 msgstr "電話"
 
-#. item "Amenities/Telephone"
 #. <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:2765
+#. item "Amenities/Telephone" label "Edit Telephone"
+#: build/trans_presets.java:2774
 msgid "Edit Telephone"
 msgstr "電話を編集"
 
-#. item "Amenities/Telephone" text "Operator"
-#. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2768 build/trans_presets.java:3042
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:2777 build/trans_presets.java:3051
 msgid "Coins"
 msgstr "コイン"
 
-#. item "Amenities/Telephone" check "Coins"
-#. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2769 build/trans_presets.java:3043
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:2778 build/trans_presets.java:3052
 msgid "Notes"
 msgstr "備考"
 
-#. item "Amenities/Telephone" check "Notes"
-#. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2770 build/trans_presets.java:3044
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:2779 build/trans_presets.java:3053
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
 
-#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
-#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2771 build/trans_presets.java:3045
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:2780 build/trans_presets.java:3054
 msgid "Debit cards"
 msgstr "デビットカード"
 
-#. item "Amenities/Telephone" check "Debit cards"
-#. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2772 build/trans_presets.java:3046
+#. item "Amenities/Telephone" check "Credit cards"
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:2781 build/trans_presets.java:3055
 msgid "Credit cards"
 msgstr "クレジットカード"
 
-#. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2773
+#. item "Amenities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2782
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
-#. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2775
+#. item "Amenities/Recycling"
+#: build/trans_presets.java:2784
 msgid "Recycling"
 msgstr "リサイクル"
 
-#. item "Amenities/Recycling"
 #. <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:2778
+#. item "Amenities/Recycling" label "Edit Recycling station"
+#: build/trans_presets.java:2787
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
 
-#. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2780
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2789
 msgid "Batteries"
 msgstr "バッテリー"
 
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2781
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2790
 msgid "Cans"
 msgstr "カン"
 
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2783
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2792
 msgid "Glass"
 msgstr "ガラス"
 
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2784
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2793
 msgid "Paper"
 msgstr "紙"
 
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2785
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2794
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2787
+#. item "Amenities/Waste Basket"
+#: build/trans_presets.java:2796
 msgid "Waste Basket"
 msgstr "ゴミ箱"
 
-#. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2789
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#: build/trans_presets.java:2798
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
 
-#. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2795
+#. item "Amenities/Bench" combo "Backrest"
+#: build/trans_presets.java:2804
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2796
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2805
 msgid "Material"
 msgstr "素材"
 
-#. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2805
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2805
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2797
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2806
 msgid "Colour"
 msgstr "色"
 
-#. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "brown"
 msgstr "茶"
 
-#. color historic
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -29468,5 +29533,5 @@
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
-#. color forest
+#. color green
 #. <icon src="misc/landmark/trees.png"/>
 #. <scale_min>1</scale_min>
@@ -29484,5 +29549,5 @@
 #. <rule>
 #. <condition k="landuse" v="grass"/>
-#. color cemetery
+#. color green
 #. <icon src="rendering/landuse/cemetery.png"/>
 #. <scale_min>1</scale_min>
@@ -29500,5 +29565,6 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2797 build/trans_style.java:3222
+#. color green
+#: build/trans_presets.java:2806 build/trans_style.java:3222
 #: build/trans_style.java:3230 build/trans_style.java:3238
 #: build/trans_style.java:3246 build/trans_style.java:3254
@@ -29508,1547 +29574,1576 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2798
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2807
 msgid "Amount of Seats"
 msgstr "席の数"
 
-#. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2800
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2809
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
-#. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2801
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#: build/trans_presets.java:2810
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
-#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Nature/Tree" text "Type"
-#: build/trans_presets.java:2803 build/trans_presets.java:3290
+#. item "Amenities/Hunting Stand" combo "Height"
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:2812 build/trans_presets.java:3316
 msgid "Height"
 msgstr "高さ"
 
-#. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2805
+#. item "Amenities/Hunting Stand" combo "Hide"
+#: build/trans_presets.java:2814
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2806
+#. item "Amenities/Hunting Stand" combo "Lock"
+#: build/trans_presets.java:2815
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2808
+#. item "Amenities/Fountain"
+#: build/trans_presets.java:2817
 msgid "Fountain"
 msgstr "噴水"
 
-#. item "Amenities/Fountain"
 #. <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:2811
+#. item "Amenities/Fountain" label "Edit Fountain"
+#: build/trans_presets.java:2820
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
-#. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2815
+#. item "Amenities/Drinking Water"
+#: build/trans_presets.java:2824
 msgid "Drinking Water"
 msgstr "飲料水"
 
-#. item "Amenities/Drinking Water"
 #. <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:2818
+#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#: build/trans_presets.java:2827
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
-#. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2822
+#. item "Amenities/Fire Hydrant"
+#: build/trans_presets.java:2831
 msgid "Fire Hydrant"
 msgstr "消火栓"
 
-#. item "Amenities/Fire Hydrant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2825
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#: build/trans_presets.java:2834
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
 
-#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2829
+#. group "Food"
+#: build/trans_presets.java:2838
 msgid "Food"
 msgstr "飲食関連"
 
-#. group "Food"
-#: build/trans_presets.java:2830
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2839
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
-#. item "Food/Supermarket"
-#: build/trans_presets.java:2831
+#. item "Food/Supermarket" label "Edit Supermarket"
+#: build/trans_presets.java:2840
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2836
+#. item "Food/Convenience Store"
+#: build/trans_presets.java:2845
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
 
-#. item "Food/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2838
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#: build/trans_presets.java:2847
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2843
+#. item "Food/Kiosk"
+#: build/trans_presets.java:2852
 msgid "Kiosk"
 msgstr "キオスク"
 
-#. item "Food/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2845
+#. item "Food/Kiosk" label "Edit Kiosk"
+#: build/trans_presets.java:2854
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2850
+#. item "Food/Butcher"
+#: build/trans_presets.java:2859
 msgid "Butcher"
 msgstr "精肉店"
 
-#. item "Food/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2852
+#. item "Food/Butcher" label "Edit Butcher"
+#: build/trans_presets.java:2861
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2857
+#. item "Food/Baker"
+#: build/trans_presets.java:2866
 msgid "Baker"
 msgstr "パン屋"
 
-#. item "Food/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2859
+#. item "Food/Baker" label "Edit Baker"
+#: build/trans_presets.java:2868
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2864
+#. item "Food/Organic"
+#: build/trans_presets.java:2873
 msgid "Organic"
 msgstr "オーガニック"
 
-#. item "Food/Organic"
-#: build/trans_presets.java:2865
+#. item "Food/Organic" label "Edit Organic Shop"
+#: build/trans_presets.java:2874
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2870
+#. item "Food/Alcohol"
+#: build/trans_presets.java:2879
 msgid "Alcohol"
 msgstr "酒屋"
 
-#. item "Food/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2872
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#: build/trans_presets.java:2881
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2877
+#. item "Food/Beverages"
+#: build/trans_presets.java:2886
 msgid "Beverages"
 msgstr "飲料店"
 
-#. item "Food/Beverages"
-#: build/trans_presets.java:2878
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#: build/trans_presets.java:2887
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2884
+#. group "Shops"
+#: build/trans_presets.java:2893
 msgid "Shops"
 msgstr "店舗"
 
-#. group "Shops"
-#: build/trans_presets.java:2885
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2894
 msgid "Chemist"
 msgstr "薬品屋"
 
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2886
+#. item "Shops/Chemist" label "Edit Chemist"
+#: build/trans_presets.java:2895
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2891
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2900
 msgid "Hairdresser"
 msgstr "美容院"
 
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2892
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#: build/trans_presets.java:2901
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2897
+#. item "Shops/Optician"
+#: build/trans_presets.java:2906
 msgid "Optician"
 msgstr "メガネ屋"
 
-#. item "Shops/Optician"
-#: build/trans_presets.java:2898
+#. item "Shops/Optician" label "Edit Optician"
+#: build/trans_presets.java:2907
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#. item "Shops/Clothes"
-#: build/trans_presets.java:2905
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#: build/trans_presets.java:2914
 msgid "Edit Clothes Shop"
 msgstr "洋服店の編集"
 
-#: build/trans_presets.java:2910
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2919
 msgid "Shoes"
 msgstr "靴店"
 
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2911
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#: build/trans_presets.java:2920
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2916
+#. item "Shops/Outdoor"
+#: build/trans_presets.java:2925
 msgid "Outdoor"
 msgstr "アウトドア店"
 
-#. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2918
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#: build/trans_presets.java:2927
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
-#. item "Shops/Sports"
-#: build/trans_presets.java:2924
+#. item "Shops/Sports" label "Edit Sports Shop"
+#: build/trans_presets.java:2933
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2929
+#. item "Shops/Dry Cleaning"
+#: build/trans_presets.java:2938
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
 
-#. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2931
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#: build/trans_presets.java:2940
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2936
+#. item "Shops/Laundry"
+#: build/trans_presets.java:2945
 msgid "Laundry"
 msgstr "ランドリー"
 
-#. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2938
+#. item "Shops/Laundry" label "Edit Laundry"
+#: build/trans_presets.java:2947
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2943
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2952
 msgid "Tailor"
 msgstr "仕立て屋"
 
-#. item "Shops/Tailor"
-#: build/trans_presets.java:2944
+#. item "Shops/Tailor" label "Edit Tailor"
+#: build/trans_presets.java:2953
 msgid "Edit Tailor"
 msgstr "仕立て屋を編集"
 
 #. <separator/>
-#: build/trans_presets.java:2950
+#. item "Shops/Computer"
+#: build/trans_presets.java:2959
 msgid "Computer"
 msgstr "コンピュータ店"
 
-#. item "Shops/Computer"
-#: build/trans_presets.java:2951
+#. item "Shops/Computer" label "Edit Computer Shop"
+#: build/trans_presets.java:2960
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2956
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2965
 msgid "Electronics"
 msgstr "家電店"
 
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2957
+#. item "Shops/Electronics" label "Edit Electronics Shop"
+#: build/trans_presets.java:2966
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2962
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2971
 msgid "Hifi"
 msgstr "オーディオショップ"
 
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2963
+#. item "Shops/Hifi" label "Edit Hifi Shop"
+#: build/trans_presets.java:2972
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2968
+#. item "Shops/Video"
+#: build/trans_presets.java:2977
 msgid "Video"
 msgstr "ビデオ"
 
-#. item "Shops/Video"
-#: build/trans_presets.java:2969
+#. item "Shops/Video" label "Edit Video Shop"
+#: build/trans_presets.java:2978
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2975
+#. item "Shops/Florist"
+#: build/trans_presets.java:2984
 msgid "Florist"
 msgstr "生花店"
 
-#. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2977
+#. item "Shops/Florist" label "Edit Florist"
+#: build/trans_presets.java:2986
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2982
+#. item "Shops/Garden Centre"
+#: build/trans_presets.java:2991
 msgid "Garden Centre"
 msgstr "園芸用品店"
 
-#. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2984
+#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#: build/trans_presets.java:2993
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2989
+#. item "Shops/Hardware"
+#: build/trans_presets.java:2998
 msgid "Hardware"
 msgstr "金物屋"
 
-#. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2991
+#. item "Shops/Hardware" label "Edit Hardware Store"
+#: build/trans_presets.java:3000
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2996
+#. item "Shops/Do-it-yourself-store"
+#: build/trans_presets.java:3005
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
 
-#. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2998
+#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#: build/trans_presets.java:3007
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:3003
+#. item "Shops/Furniture"
+#: build/trans_presets.java:3012
 msgid "Furniture"
 msgstr "家具店"
 
-#. item "Shops/Furniture"
-#: build/trans_presets.java:3004
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#: build/trans_presets.java:3013
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:3009
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3018
 msgid "Stationery"
 msgstr "文具店"
 
-#. item "Shops/Stationery"
-#: build/trans_presets.java:3010
+#. item "Shops/Stationery" label "Edit Stationery Shop"
+#: build/trans_presets.java:3019
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:3015
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3024
 msgid "Book Store"
 msgstr "本屋"
 
-#. item "Shops/Book Store"
-#: build/trans_presets.java:3016
+#. item "Shops/Book Store" label "Edit Book Store"
+#: build/trans_presets.java:3025
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:3021
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3030
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:3022
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#: build/trans_presets.java:3031
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:3027
+#. item "Shops/Toys"
+#: build/trans_presets.java:3036
 msgid "Toys"
 msgstr "おもちゃ屋"
 
-#. item "Shops/Toys"
-#: build/trans_presets.java:3028
+#. item "Shops/Toys" label "Edit Toy Shop"
+#: build/trans_presets.java:3037
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. <separator/>
-#: build/trans_presets.java:3034
+#. item "Shops/Vending machine"
+#: build/trans_presets.java:3043
 msgid "Vending machine"
 msgstr "自動販売機"
 
-#. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:3036
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#: build/trans_presets.java:3045
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
 
-#. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:3038
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3047
 msgid "Vending products"
 msgstr "自動販売機"
 
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "food"
 msgstr "飲食関連"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "bicycle_tube"
 msgstr "自転車のチューブ"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "excrement_bags"
 msgstr "糞袋"
 
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:3047
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3056
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:3050
+#. group "Cash"
+#: build/trans_presets.java:3059
 msgid "Cash"
 msgstr "お金"
 
-#. group "Cash"
-#: build/trans_presets.java:3051
+#. item "Cash/Bank"
+#: build/trans_presets.java:3060
 msgid "Bank"
 msgstr "銀行"
 
-#. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:3053
+#. item "Cash/Bank" label "Edit Bank"
+#: build/trans_presets.java:3062
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:3058 build/trans_presets.java:3067
+#. item "Cash/Bank" check "Automated Teller Machine"
+#. item "Cash/Automated Teller Machine"
+#: build/trans_presets.java:3067 build/trans_presets.java:3076
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:3060
+#. item "Cash/Money Exchange"
+#: build/trans_presets.java:3069
 msgid "Money Exchange"
 msgstr "両替"
 
-#. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:3062
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#: build/trans_presets.java:3071
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
 
-#. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:3069
+#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#: build/trans_presets.java:3078
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:3074
+#. group "Health"
+#: build/trans_presets.java:3083
 msgid "Health"
 msgstr "健康"
 
-#. group "Health"
-#: build/trans_presets.java:3075
+#. item "Health/Doctors"
+#: build/trans_presets.java:3084
 msgid "Doctors"
 msgstr "医院"
 
-#. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:3077
+#. item "Health/Doctors" label "Edit Doctors"
+#: build/trans_presets.java:3086
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:3082
+#. item "Health/Dentist"
+#: build/trans_presets.java:3091
 msgid "Dentist"
 msgstr "歯科医院"
 
-#. item "Health/Dentist"
-#: build/trans_presets.java:3083
+#. item "Health/Dentist" label "Edit Dentist"
+#: build/trans_presets.java:3092
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:3088
+#. item "Health/Pharmacy"
+#: build/trans_presets.java:3097
 msgid "Pharmacy"
 msgstr "薬局"
 
-#. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:3090
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#: build/trans_presets.java:3099
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
 
-#. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:3092
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:3101
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:3096
+#. item "Health/Hospital"
+#: build/trans_presets.java:3105
 msgid "Hospital"
 msgstr "病院"
 
-#. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3098
+#. item "Health/Hospital" label "Edit Hospital"
+#: build/trans_presets.java:3107
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3102
+#. item "Health/Baby Hatch"
+#: build/trans_presets.java:3111
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
 
-#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:3104
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#: build/trans_presets.java:3113
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
-#. item "Health/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:3109
+#. item "Health/Emergency Access Point"
+#: build/trans_presets.java:3118
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
 
-#. item "Health/Emergency Access Point"
 #. <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:3112
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#: build/trans_presets.java:3121
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
 
-#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3115
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:3124
 msgid "Point Number"
 msgstr "ポイント数"
 
-#. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3116
+#. item "Health/Emergency Access Point" text "Point Name"
+#: build/trans_presets.java:3125
 msgid "Point Name"
 msgstr "ポイント名"
 
-#. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3119
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#: build/trans_presets.java:3128
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
 
-#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3122
+#. item "Health/Veterinary"
+#: build/trans_presets.java:3131
 msgid "Veterinary"
 msgstr "動物病院"
 
-#. item "Health/Veterinary"
 #. <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:3125
+#. item "Health/Veterinary" label "Edit Veterinary"
+#: build/trans_presets.java:3134
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#. item "Places/Locality" text "Name"
-#: build/trans_presets.java:3132 build/trans_presets.java:3238
+#. group "Geography"
+#: build/trans_presets.java:3141 build/trans_presets.java:3258
 msgid "Geography"
 msgstr "地理学"
 
-#. group "Geography"
-#: build/trans_presets.java:3133
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3142
 msgid "Boundaries"
 msgstr "境界線"
 
-#. group "Geography/Boundaries"
-#: build/trans_presets.java:3134
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3143
 msgid "National"
 msgstr "国境"
 
-#. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3135
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#: build/trans_presets.java:3144
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
-#. item "Geography/Boundaries/National" text "Name"
-#: build/trans_presets.java:3140
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3149
 msgid "Administrative"
 msgstr "行政区画"
 
-#. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3141
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#: build/trans_presets.java:3150
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
-#. item "Geography/Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3146
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3155
 msgid "Civil"
 msgstr "Civil境界"
 
-#. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3147
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#: build/trans_presets.java:3156
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
-#. item "Geography/Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3152
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3161
 msgid "Political"
 msgstr "地点名"
 
-#. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3153
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#: build/trans_presets.java:3162
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
-#. item "Geography/Boundaries/Political" text "Name"
-#: build/trans_presets.java:3158
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3167
 msgid "National park"
 msgstr "国立公園"
 
-#. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3159
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#: build/trans_presets.java:3168
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
-#. item "Geography/Boundaries/National park" text "Name"
-#: build/trans_presets.java:3165
+#. group "Places"
+#: build/trans_presets.java:3174
 msgid "Places"
 msgstr "地名"
 
-#. group "Places"
-#: build/trans_presets.java:3166
+#. item "Places/Continent"
+#: build/trans_presets.java:3175
 msgid "Continent"
 msgstr "大陸"
 
-#. item "Places/Continent"
-#: build/trans_presets.java:3167
+#. item "Places/Continent" label "Edit Continent"
+#: build/trans_presets.java:3176
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
-#. item "Places/Continent" text "Name"
-#: build/trans_presets.java:3172
+#. item "Places/Country"
+#: build/trans_presets.java:3182
 msgid "Country"
 msgstr "国(country)"
 
-#. item "Places/Country"
-#: build/trans_presets.java:3173
+#. item "Places/Country" label "Edit Country"
+#: build/trans_presets.java:3183
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
-#. item "Places/Country" text "Name"
-#: build/trans_presets.java:3178
+#. item "Places/State"
+#: build/trans_presets.java:3189
 msgid "State"
 msgstr "州(state)"
 
-#. item "Places/State"
-#: build/trans_presets.java:3179
+#. item "Places/State" label "Edit State"
+#: build/trans_presets.java:3190
 msgid "Edit State"
 msgstr "州(state)の編集"
 
-#. item "Places/State" text "Name"
-#: build/trans_presets.java:3184
+#. item "Places/Region"
+#: build/trans_presets.java:3196
 msgid "Region"
 msgstr "地方"
 
-#. item "Places/Region"
-#: build/trans_presets.java:3185
+#. item "Places/Region" label "Edit Region"
+#: build/trans_presets.java:3197
 msgid "Edit Region"
 msgstr "地方の編集"
 
-#. item "Places/Region" text "Name"
-#: build/trans_presets.java:3190
+#. item "Places/County"
+#: build/trans_presets.java:3203
 msgid "County"
 msgstr "郡"
 
-#. item "Places/County"
-#: build/trans_presets.java:3191
+#. item "Places/County" label "Edit County"
+#: build/trans_presets.java:3204
 msgid "Edit County"
 msgstr "郡の編集"
 
-#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3197
+#. item "Places/City"
+#: build/trans_presets.java:3211
 msgid "City"
 msgstr "市区"
 
-#. item "Places/City"
-#: build/trans_presets.java:3198
+#. item "Places/City" label "Edit City"
+#: build/trans_presets.java:3212
 msgid "Edit City"
 msgstr "市区の編集"
 
-#. item "Places/City" text "Name"
-#: build/trans_presets.java:3203
+#. item "Places/Town"
+#: build/trans_presets.java:3218
 msgid "Town"
 msgstr "町"
 
-#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3205
+#. item "Places/Town" label "Edit Town"
+#: build/trans_presets.java:3220
 msgid "Edit Town"
 msgstr "町の編集"
 
-#. item "Places/Town" text "Name"
-#: build/trans_presets.java:3210
+#. item "Places/Suburb"
+#: build/trans_presets.java:3226
 msgid "Suburb"
 msgstr "近郊住宅地"
 
-#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3212
+#. item "Places/Suburb" label "Edit Suburb"
+#: build/trans_presets.java:3228
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
-#. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:3217
+#. item "Places/Village"
+#: build/trans_presets.java:3234
 msgid "Village"
 msgstr "村"
 
-#. item "Places/Village"
-#: build/trans_presets.java:3218
+#. item "Places/Village" label "Edit Village"
+#: build/trans_presets.java:3235
 msgid "Edit Village"
 msgstr "村の編集"
 
-#. item "Places/Village" text "Name"
-#: build/trans_presets.java:3223
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3241
 msgid "Hamlet"
 msgstr "小村落"
 
-#. item "Places/Hamlet"
-#: build/trans_presets.java:3224
+#. item "Places/Hamlet" label "Edit Hamlet"
+#: build/trans_presets.java:3242
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
-#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3230
+#. item "Places/Locality"
+#: build/trans_presets.java:3249
 msgid "Locality"
 msgstr "地域"
 
-#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3232
+#. item "Places/Locality" label "Edit Locality"
+#: build/trans_presets.java:3251
 msgid "Edit Locality"
 msgstr "地域の編集"
 
-#. group "Geography"
-#: build/trans_presets.java:3239
+#. item "Geography/Peak"
+#: build/trans_presets.java:3259
 msgid "Peak"
 msgstr "山頂"
 
-#. item "Geography/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3241
+#. item "Geography/Peak" label "Edit Peak"
+#: build/trans_presets.java:3261
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
-#. item "Geography/Peak" text "Elevation"
-#: build/trans_presets.java:3246
+#. item "Geography/Glacier"
+#: build/trans_presets.java:3267
 msgid "Glacier"
 msgstr "氷河"
 
-#. item "Geography/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3248
+#. item "Geography/Glacier" label "Edit Glacier"
+#: build/trans_presets.java:3269
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
-#. item "Geography/Glacier" text "Elevation"
-#: build/trans_presets.java:3253
+#. item "Geography/Volcano"
+#: build/trans_presets.java:3275
 msgid "Volcano"
 msgstr "火山"
 
-#. item "Geography/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3255
+#. item "Geography/Volcano" label "Edit Volcano"
+#: build/trans_presets.java:3277
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
-#. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:3260
+#. item "Geography/Cave Entrance"
+#: build/trans_presets.java:3283
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
 
-#. item "Geography/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3262
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#: build/trans_presets.java:3285
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
-#. item "Geography/Cave Entrance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3267
+#. item "Geography/Island"
+#: build/trans_presets.java:3291
 msgid "Island"
 msgstr "島"
 
-#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3269
+#. item "Geography/Island" label "Edit Island"
+#: build/trans_presets.java:3293
 msgid "Edit Island"
 msgstr "島の編集"
 
-#. item "Geography/Island" text "Name"
-#: build/trans_presets.java:3274
+#. item "Geography/Islet"
+#: build/trans_presets.java:3299
 msgid "Islet"
 msgstr "小島"
 
-#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3276
+#. item "Geography/Islet" label "Edit Islet"
+#: build/trans_presets.java:3301
 msgid "Edit Islet"
 msgstr "小島を編集"
 
-#. item "Geography/Islet" text "Name"
-#: build/trans_presets.java:3282
+#. group "Nature"
+#: build/trans_presets.java:3308
 msgid "Nature"
 msgstr "自然"
 
-#. group "Nature"
-#: build/trans_presets.java:3283
+#. item "Nature/Tree"
+#: build/trans_presets.java:3309
 msgid "Tree"
 msgstr "樹木・林"
 
-#. item "Nature/Tree"
 #. <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:3286
+#. item "Nature/Tree" label "Edit Tree"
+#: build/trans_presets.java:3312
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
-#. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:3291
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3317
 msgid "Botanical Name"
 msgstr "植物の名前"
 
-#. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3293
+#. item "Nature/Wood"
+#: build/trans_presets.java:3319
 msgid "Wood"
 msgstr "森"
 
-#. item "Nature/Wood"
 #. <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:3296
+#. item "Nature/Wood" label "Edit Wood"
+#: build/trans_presets.java:3322
 msgid "Edit Wood"
 msgstr "森の編集"
 
-#. item "Nature/Wood" combo "Type"
-#. item "Nature/Forest" combo "Type"
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:3301
+#. item "Nature/Forest"
+#: build/trans_presets.java:3327
 msgid "Forest"
 msgstr "森林"
 
-#. item "Nature/Forest"
 #. <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:3304
+#. item "Nature/Forest" label "Edit Forest Landuse"
+#: build/trans_presets.java:3330
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:3310
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3336
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
-#. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3311
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
+#: build/trans_presets.java:3337
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
 
-#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3316
+#. item "Nature/Scree"
+#: build/trans_presets.java:3342
 msgid "Scree"
 msgstr "ガレ場"
 
-#. item "Nature/Scree"
-#: build/trans_presets.java:3317
+#. item "Nature/Scree" label "Edit Scree"
+#: build/trans_presets.java:3343
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
-#. item "Nature/Scree" text "Name"
-#: build/trans_presets.java:3321
+#. item "Nature/Fell"
+#: build/trans_presets.java:3347
 msgid "Fell"
 msgstr "山(Fell)"
 
-#. item "Nature/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3323
+#. item "Nature/Fell" label "Edit Fell"
+#: build/trans_presets.java:3349
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
-#. item "Nature/Fell" text "Name"
-#: build/trans_presets.java:3327
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3353
 msgid "Scrub"
 msgstr "低木林"
 
-#. item "Nature/Scrub"
-#: build/trans_presets.java:3328
+#. item "Nature/Scrub" label "Edit Scrub"
+#: build/trans_presets.java:3354
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
-#. item "Nature/Scrub" text "Name"
-#: build/trans_presets.java:3332
+#. item "Nature/Heath"
+#: build/trans_presets.java:3358
 msgid "Heath"
 msgstr "荒れ地"
 
-#. item "Nature/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3334
+#. item "Nature/Heath" label "Edit Heath"
+#: build/trans_presets.java:3360
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
 
-#. item "Nature/Heath" text "Name"
-#: build/trans_presets.java:3339
+#. group "Land use"
+#: build/trans_presets.java:3365
 msgid "Land use"
 msgstr "土地利用"
 
-#. group "Land use"
-#: build/trans_presets.java:3340
+#. item "Land use/Farmyard"
+#: build/trans_presets.java:3366
 msgid "Farmyard"
 msgstr "農家の庭"
 
-#. item "Land use/Farmyard"
 #. <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:3343
+#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#: build/trans_presets.java:3369
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
-#. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3348
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3374
 msgid "Farmland"
 msgstr "農地"
 
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3349
+#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#: build/trans_presets.java:3375
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
-#. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3354
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3380
 msgid "Meadow"
 msgstr "牧草地"
 
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3355
+#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#: build/trans_presets.java:3381
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
-#. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3360
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3386
 msgid "Vineyard"
 msgstr "ぶどう園"
 
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3361
+#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#: build/trans_presets.java:3387
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3366
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3392
 msgid "Allotments"
 msgstr "貸し農園"
 
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3367
+#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#: build/trans_presets.java:3393
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
 
-#. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3373
+#. item "Land use/Garden"
+#: build/trans_presets.java:3399
 msgid "Garden"
 msgstr "庭園"
 
-#. item "Land use/Garden"
-#: build/trans_presets.java:3374
+#. item "Land use/Garden" label "Edit Garden"
+#: build/trans_presets.java:3400
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
-#. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3378
+#. item "Land use/Grass"
+#: build/trans_presets.java:3404
 msgid "Grass"
 msgstr "草地"
 
-#. item "Land use/Grass"
-#: build/trans_presets.java:3379
+#. item "Land use/Grass" label "Edit Grass Landuse"
+#: build/trans_presets.java:3405
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
-#. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3384
+#. item "Land use/Village Green"
+#: build/trans_presets.java:3410
 msgid "Village Green"
 msgstr "里山"
 
-#. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3386
+#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#: build/trans_presets.java:3412
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
-#. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3391
+#. item "Land use/Common"
+#: build/trans_presets.java:3417
 msgid "Common"
 msgstr "共有地"
 
-#. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3393
+#. item "Land use/Common" label "Edit Common"
+#: build/trans_presets.java:3419
 msgid "Edit Common"
 msgstr "共有地の名前"
 
-#. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3397
+#. item "Land use/Park"
+#: build/trans_presets.java:3423
 msgid "Park"
 msgstr "公園"
 
-#. item "Land use/Park"
-#: build/trans_presets.java:3398
+#. item "Land use/Park" label "Edit Park"
+#: build/trans_presets.java:3424
 msgid "Edit Park"
 msgstr "公園の編集"
 
-#. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3402
+#. item "Land use/Recreation Ground"
+#: build/trans_presets.java:3428
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
 
-#. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3404
+#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#: build/trans_presets.java:3430
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
 
-#. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3410
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3436
 msgid "Residential area"
 msgstr "住宅エリア"
 
-#. item "Land use/Residential area"
-#: build/trans_presets.java:3411
+#. item "Land use/Residential area" label "Edit Residential Landuse"
+#: build/trans_presets.java:3437
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
-#. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3416
+#. item "Land use/Graveyard"
+#: build/trans_presets.java:3442
 msgid "Graveyard"
 msgstr "墓所"
 
-#. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3418
+#. item "Land use/Graveyard" label "Edit Graveyard"
+#: build/trans_presets.java:3444
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3424
+#. item "Land use/Cemetery"
+#: build/trans_presets.java:3450
 msgid "Cemetery"
 msgstr "共同墓地"
 
-#. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3426
+#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#: build/trans_presets.java:3452
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3433
+#. item "Land use/Retail"
+#: build/trans_presets.java:3459
 msgid "Retail"
 msgstr "小売り商業"
 
-#. item "Land use/Retail"
-#: build/trans_presets.java:3434
+#. item "Land use/Retail" label "Edit Retail Landuse"
+#: build/trans_presets.java:3460
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
-#. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3439
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3465
 msgid "Commercial"
 msgstr "商用"
 
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3440
+#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#: build/trans_presets.java:3466
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3445
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3471
 msgid "Industrial"
 msgstr "工業"
 
-#. item "Land use/Industrial"
-#: build/trans_presets.java:3446
+#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#: build/trans_presets.java:3472
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
-#. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3451
+#. item "Land use/Railway land"
+#: build/trans_presets.java:3477
 msgid "Railway land"
 msgstr "鉄道用地"
 
-#. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3453
+#. item "Land use/Railway land" label "Edit Railway Landuse"
+#: build/trans_presets.java:3479
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
-#. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3458
+#. item "Land use/Military"
+#: build/trans_presets.java:3484
 msgid "Military"
 msgstr "軍用"
 
-#. item "Land use/Military"
-#: build/trans_presets.java:3459
+#. item "Land use/Military" label "Edit Military Landuse"
+#: build/trans_presets.java:3485
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
 
-#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3465
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3491
 msgid "Construction area"
 msgstr "工事中エリア"
 
-#. item "Land use/Construction area"
-#: build/trans_presets.java:3466
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#: build/trans_presets.java:3492
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3471
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3497
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3472
+#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#: build/trans_presets.java:3498
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3477
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3503
 msgid "Greenfield"
 msgstr "未開発工業地"
 
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3478
+#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#: build/trans_presets.java:3504
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3483
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3509
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3484
+#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#: build/trans_presets.java:3510
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3489
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3515
 msgid "Quarry"
 msgstr "採石場"
 
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3490
+#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#: build/trans_presets.java:3516
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:3497
+#. group "Annotation"
+#: build/trans_presets.java:3523
 msgid "Annotation"
 msgstr "注釈"
 
-#. group "Annotation"
-#: build/trans_presets.java:3498
+#. item "Annotation/Addresses"
+#: build/trans_presets.java:3524
 msgid "Addresses"
 msgstr "住所"
 
-#. item "Annotation/Addresses"
 #. <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:3501
+#. item "Annotation/Addresses" label "Edit Address Information"
+#: build/trans_presets.java:3527
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
 
-#. item "Annotation/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:3503
+#. item "Annotation/Addresses" text "House number"
+#: build/trans_presets.java:3529
 msgid "House number"
 msgstr "番地"
 
-#. item "Annotation/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:3505
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3531
 msgid "House name"
 msgstr "家の名前"
 
-#. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3506
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3532
 msgid "Street name"
 msgstr "ストリートの名前"
 
-#. item "Annotation/Addresses" text "Street name"
-#: build/trans_presets.java:3507
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3533
 msgid "City name"
 msgstr "都市名"
 
-#. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:3508
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3534
 msgid "Post code"
 msgstr "郵便番号"
 
-#. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:3509
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3535
 msgid "Country code"
 msgstr "国コード"
 
-#. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "AT"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "CH"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "DE"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "FR"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "GB"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "IT"
 msgstr ""
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "US"
 msgstr ""
 
-#. item "Annotation/Address Interpolation"
 #. <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:3515
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#: build/trans_presets.java:3541
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
 
-#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:3517
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3543
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
-#. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:3519
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3545
 msgid "Contact"
 msgstr "連絡先"
 
-#. item "Annotation/Contact"
-#: build/trans_presets.java:3520
+#. item "Annotation/Contact" label "Edit Contact information"
+#: build/trans_presets.java:3546
 msgid "Edit Contact information"
 msgstr "連絡先の編集"
 
-#. item "Annotation/Contact" text "Email Address"
-#. <space />
-#: build/trans_presets.java:3528
-msgid "Wikipedia"
-msgstr "Wikipedia"
-
-#. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:3529
+#. item "Annotation/Contact" text "Image"
+#: build/trans_presets.java:3555
 msgid "Image"
 msgstr "画像"
 
-#. item "Relations/Multipolygon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3537
+#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#: build/trans_presets.java:3563
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
 
-#. item "Relations/Multipolygon" text "Name"
 #. </optional>
 #. <roles>
-#. item "Relations/Boundary" combo "Administrative level"
+#. item "Relations/Multipolygon" role "outer segment"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3543 build/trans_presets.java:3560
+#. item "Relations/Boundary" role "outer segment"
+#: build/trans_presets.java:3569 build/trans_presets.java:3586
 msgid "outer segment"
 msgstr "外側のセグメント"
 
-#. item "Relations/Multipolygon" role "outer segment"
-#. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3544 build/trans_presets.java:3561
+#. item "Relations/Multipolygon" role "inner segment"
+#. item "Relations/Boundary" role "inner segment"
+#: build/trans_presets.java:3570 build/trans_presets.java:3587
 msgid "inner segment"
 msgstr "内側のセグメント"
 
-#. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3547
+#. item "Relations/Boundary"
+#: build/trans_presets.java:3573
 msgid "Boundary"
 msgstr "境界"
 
-#. item "Relations/Boundary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3552
+#. item "Relations/Boundary" label "Edit Boundary"
+#: build/trans_presets.java:3578
 msgid "Edit Boundary"
 msgstr "境界の編集"
 
-#. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3556
+#. item "Relations/Boundary" combo "Boundary type"
+#: build/trans_presets.java:3582
 msgid "Boundary type"
 msgstr "境界のタイプ"
 
-#. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3557
+#. item "Relations/Boundary" combo "Administrative level"
+#: build/trans_presets.java:3583
 msgid "Administrative level"
 msgstr ""
 
-#. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3562
+#. item "Relations/Boundary" role "Sub area"
+#: build/trans_presets.java:3588
 msgid "Sub area"
 msgstr ""
 
-#. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3563
+#. item "Relations/Boundary" role "Administration centre"
+#: build/trans_presets.java:3589
 msgid "Administration centre"
 msgstr ""
 
-#. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3566
+#. item "Relations/Turn restriction"
+#: build/trans_presets.java:3592
 msgid "Turn restriction"
 msgstr "右左折制限"
 
-#. item "Relations/Turn restriction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3569
+#. item "Relations/Turn restriction" label "Edit Turn Restriction"
+#: build/trans_presets.java:3595
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
 
-#. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3571
+#. item "Relations/Turn restriction" combo "Restriction"
+#: build/trans_presets.java:3597
 msgid "Restriction"
 msgstr "通行制限"
 
-#. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_straight_on"
 msgstr "直進のみ"
 
-#. item "Relations/Turn restriction" text "Name"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3576
+#. item "Relations/Turn restriction" role "from way"
+#: build/trans_presets.java:3602
 msgid "from way"
 msgstr "ウェイから"
 
-#. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3577
+#. item "Relations/Turn restriction" role "via node or way"
+#: build/trans_presets.java:3603
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
-#. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3578
+#. item "Relations/Turn restriction" role "to way"
+#: build/trans_presets.java:3604
 msgid "to way"
 msgstr "ウェイへ"
 
-#. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3581
+#. item "Relations/Route"
+#: build/trans_presets.java:3607
 msgid "Route"
 msgstr "ルート"
 
-#. item "Relations/Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3584
+#. item "Relations/Route" label "Edit Route"
+#: build/trans_presets.java:3610
 msgid "Edit Route"
 msgstr "ルート編集"
 
-#. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3586
+#. item "Relations/Route" combo "Route type"
+#: build/trans_presets.java:3612
 msgid "Route type"
 msgstr "ルート種類"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "ski"
 msgstr "スキー"
 
-#. color bicycle
 #. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -31064,5 +31159,5 @@
 #. <rule>
 #. <condition k="foot" v="designated"/>
-#. color bicycle
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31080,5 +31175,5 @@
 #. <rule>
 #. <condition k="highway" v="path"/>
-#. color bicycle
+#. color foot
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31096,5 +31191,5 @@
 #. <condition k="highway" v="path"/>
 #. <condition k="foot" v="official"/>
-#. color bicycle
+#. color foot
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31104,13 +31199,13 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="steps"/>
 #. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3586 build/trans_style.java:247
+#: build/trans_presets.java:3612 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31120,13 +31215,12 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "detour"
 msgstr "迂回路"
 
-#. color otherrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31136,74 +31230,75 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3586 build/trans_style.java:1233
+#. color subway
+#: build/trans_presets.java:3612 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鉄"
 
-#. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3589
+#. item "Relations/Route" text "Symbol description"
+#: build/trans_presets.java:3615
 msgid "Symbol description"
 msgstr "シンボルの説明"
 
-#. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3592
+#. item "Relations/Route" text "Network"
+#: build/trans_presets.java:3618
 msgid "Network"
 msgstr "ネットワーク"
 
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3594
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3620
 msgid "Route state"
 msgstr "ルート状態"
 
-#. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3595
+#. item "Relations/Route" text "Color (hex)"
+#: build/trans_presets.java:3621
 msgid "Color (hex)"
 msgstr "色 (16進法)"
 
-#. item "Relations/Route" text "Color (hex)"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3598
+#. item "Relations/Route" role "route segment"
+#: build/trans_presets.java:3624
 msgid "route segment"
 msgstr "ルートセグメント"
 
-#. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3599
+#. item "Relations/Route" role "forward segment"
+#: build/trans_presets.java:3625
 msgid "forward segment"
 msgstr "前のセグメント"
 
-#. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3600
+#. item "Relations/Route" role "backward segment"
+#: build/trans_presets.java:3626
 msgid "backward segment"
 msgstr "後方セグメント"
 
-#. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3601
+#. item "Relations/Route" role "halt point"
+#: build/trans_presets.java:3627
 msgid "halt point"
 msgstr "停止点"
 
-#. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3602
+#. item "Relations/Route" role "forward halt point"
+#: build/trans_presets.java:3628
 msgid "forward halt point"
 msgstr "前方の停止点"
 
-#. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3603
+#. item "Relations/Route" role "backward halt point"
+#: build/trans_presets.java:3629
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -31280,9 +31375,9 @@
 #. -->
 #.
+#. mappaint style named "standard"
 #: build/trans_style.java:72
 msgid "standard"
 msgstr "標準"
 
-#. mappaint style named "standard"
 #.
 #. <rule>
@@ -31344,5 +31439,5 @@
 #. <rule>
 #. <condition k="bridge" b="yes"/>
-#. color deprecated
+#. color bridge
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31372,4 +31467,5 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
+#. color bridge
 #: build/trans_style.java:132 build/trans_style.java:146
 #: build/trans_style.java:153 build/trans_style.java:160
@@ -31378,5 +31474,4 @@
 msgstr "橋"
 
-#. color bridge
 #. <icon annotate="true" src="vehicle/viaduct.png"/>
 #. <scale_min>1</scale_min>
@@ -31385,5 +31480,5 @@
 #. <rule>
 #. <condition k="bridge" b="no"/>
-#. color bridge
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31406,5 +31501,5 @@
 #. <rule>
 #. <condition k="embankment" b="no"/>
-#. color street
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31414,5 +31509,5 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
-#. color sport
+#. color deprecated
 #. <icon annotate="true" src="sport/fishing.png"/>
 #. <scale_min>1</scale_min>
@@ -31428,4 +31523,5 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
+#. color deprecated
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
@@ -31434,5 +31530,4 @@
 msgstr "破棄された"
 
-#. color foot
 #. <icon annotate="true" src="vehicle/restriction/foot-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -31462,5 +31557,5 @@
 #. <rule>
 #. <condition k="horse" v="designated"/>
-#. color service
+#. color horse
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31470,9 +31565,9 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
+#. color horse
 #: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "馬"
 
-#. color horse
 #. <icon src="vehicle/restriction/horse-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -31601,5 +31696,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31621,5 +31715,4 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31641,5 +31734,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31662,5 +31754,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31675,5 +31766,4 @@
 #. <condition k="barrier" v="retaining_wall"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
-#. color barrier
 #. color barrier
 #. <scale_min>1</scale_min>
@@ -31700,5 +31790,4 @@
 msgstr "バリア"
 
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31757,9 +31846,9 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
+#. color motorroad
 #: build/trans_style.java:548
 msgid "motorroad"
 msgstr "車道"
 
-#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31769,5 +31858,5 @@
 #. <rule>
 #. <condition k="highway" v="track"/>
-#. color bicycle
+#. color highway_track
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31811,4 +31900,5 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
+#. color highway_track
 #: build/trans_style.java:649 build/trans_style.java:976
 #: build/trans_style.java:984 build/trans_style.java:992
@@ -31817,5 +31907,4 @@
 msgstr "車線"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31903,9 +31992,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#. color services
 #: build/trans_style.java:867
 msgid "services"
 msgstr "敷地内道路"
 
-#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -31915,9 +32004,9 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#. color ford
 #: build/trans_style.java:875
 msgid "ford"
 msgstr "浅瀬（洗い越し）"
 
-#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -31934,9 +32023,9 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
+#. color turningcircle
 #: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "転回所"
 
-#. color construction
 #. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
@@ -31947,9 +32036,9 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
+#. color emergency_access_point
 #: build/trans_style.java:914
 msgid "emergency_access_point"
 msgstr "緊急アクセスポイント"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31964,5 +32053,4 @@
 msgstr "川岸"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31972,9 +32060,9 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
+#. color stream
 #: build/trans_style.java:1043
 msgid "stream"
 msgstr "小川"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -31984,9 +32072,9 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
+#. color dock
 #: build/trans_style.java:1066
 msgid "dock"
 msgstr "ドック"
 
-#. color dock
 #. <icon annotate="true" src="nautical/boatyard.png"/>
 #. <scale_min>1</scale_min>
@@ -32040,5 +32128,5 @@
 #. <condition k="waterway" v="weir"/>
 #. <icon annotate="true" src="nautical/weir.png"/>
-#. color rapids
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32049,5 +32137,4 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32057,5 +32144,5 @@
 #. <condition k="waterway" v="waterfall"/>
 #. <icon annotate="true" src="nautical/waterfall.png"/>
-#. color power
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32099,5 +32186,5 @@
 #. <condition k="man_made" v="lighthouse"/>
 #. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
-#. color pipeline
+#. color manmade
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32187,4 +32274,5 @@
 #. <condition k="man_made" v="water_works"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
 #: build/trans_style.java:1089 build/trans_style.java:1118
 #: build/trans_style.java:1134 build/trans_style.java:1135
@@ -32200,5 +32288,4 @@
 msgstr "人工物"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32208,9 +32295,9 @@
 #. <condition k="waterway" v="rapids"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color rapids
 #: build/trans_style.java:1126
 msgid "rapids"
 msgstr "rapids"
 
-#. color manmade
 #. <!-- it's not possible to have both line and area, line seems more likely -->
 #. <scale_min>1</scale_min>
@@ -32268,4 +32355,5 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
+#. color railwaypoint
 #: build/trans_style.java:1153 build/trans_style.java:1168
 #: build/trans_style.java:1183 build/trans_style.java:1191
@@ -32274,5 +32362,4 @@
 msgstr "鉄道ポイント"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32283,5 +32370,5 @@
 #. <condition k="railway" v="tram"/>
 #. <!-- prefer way types over tram - draw tram as overlay in joined cases -->
-#. color railover
+#. color otherrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32291,14 +32378,14 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
+#. color otherrail
 #: build/trans_style.java:1216 build/trans_style.java:1225
 msgid "otherrail"
 msgstr "その他の軌道"
 
-#. color otherrail
+#. color railover
 #: build/trans_style.java:1217
 msgid "railover"
 msgstr "高架鉄道"
 
-#. color subway
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32318,5 +32405,4 @@
 #. <rule>
 #. <condition k="railway" v="disused"/>
-#. color oldrail
 #. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -32336,5 +32422,4 @@
 msgstr "古い軌道"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32368,5 +32453,4 @@
 #. <condition k="aeroway" v="aerodrome"/>
 #. color aeroway
-#. color aeroway_dark
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -32376,4 +32460,5 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
+#. color aeroway
 #: build/trans_style.java:1343 build/trans_style.java:1344
 #: build/trans_style.java:1376
@@ -32381,5 +32466,4 @@
 msgstr "空路"
 
-#. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
 #. <scale_min>1</scale_min>
@@ -32397,9 +32481,9 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
+#. color aeroway_dark
 #: build/trans_style.java:1360 build/trans_style.java:1368
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
 
-#. color aeroway
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -32409,9 +32493,9 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
+#. color aeroway_light
 #: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr "空路（明色）"
 
-#. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -32485,4 +32569,5 @@
 #. <rule>
 #. <condition k="aerialway" v="goods"/>
+#. color aerialway
 #: build/trans_style.java:1408 build/trans_style.java:1416
 #: build/trans_style.java:1424 build/trans_style.java:1432
@@ -32492,5 +32577,4 @@
 msgstr "リフト"
 
-#. color aerialway
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -32507,5 +32591,4 @@
 msgstr "初球者スキーコース"
 
-#. color piste_easy
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32520,5 +32603,4 @@
 msgstr "中級者スキーコース"
 
-#. color piste_intermediate
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32533,5 +32615,4 @@
 msgstr "上級者スキーコース"
 
-#. color piste_advanced
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32546,5 +32627,4 @@
 msgstr "熟練者用のゲレンデ"
 
-#. color piste_expert
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32559,5 +32639,4 @@
 msgstr "フリースタイルのゲレンデ"
 
-#. color piste_freeride
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32572,5 +32651,4 @@
 msgstr "初心者スキーゲレンデ"
 
-#. color piste_novice
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -32686,4 +32764,5 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
+#. color power
 #: build/trans_style.java:1523 build/trans_style.java:1537
 #: build/trans_style.java:1545 build/trans_style.java:1554
@@ -32696,5 +32775,4 @@
 msgstr "電力"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32708,5 +32786,4 @@
 msgstr "桟橋"
 
-#. color pier
 #. <icon annotate="true" src="nautical/pier.png"/>
 #. <scale_min>1</scale_min>
@@ -32716,9 +32793,9 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
+#. color pipeline
 #: build/trans_style.java:1684
 msgid "pipeline"
 msgstr "パイプライン"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32770,5 +32847,5 @@
 #. <condition k="leisure" v="water_park"/>
 #. <icon annotate="true" src="leisure/water_park.png"/>
-#. color marina
+#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32858,4 +32935,5 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
+#. color leisure
 #: build/trans_style.java:1782 build/trans_style.java:1790
 #: build/trans_style.java:1798 build/trans_style.java:1806
@@ -32870,5 +32948,4 @@
 msgstr "レジャー"
 
-#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32878,9 +32955,9 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
+#. color marina
 #: build/trans_style.java:1830
 msgid "marina"
 msgstr "マリーナ"
 
-#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32972,4 +33049,5 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
+#. color amenity
 #: build/trans_style.java:1928 build/trans_style.java:1936
 #: build/trans_style.java:1944 build/trans_style.java:1952
@@ -32981,5 +33059,4 @@
 msgstr "アメニティ"
 
-#. color amenity
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33085,4 +33162,5 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#. color amenity_traffic
 #: build/trans_style.java:2016 build/trans_style.java:2024
 #: build/trans_style.java:2032 build/trans_style.java:2040
@@ -33095,5 +33173,4 @@
 msgstr "アメニティ_交通"
 
-#. color amenity_traffic
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33180,5 +33257,5 @@
 #. <condition k="amenity" v="community_centre"/>
 #. <icon annotate="true" src="service.png"/>
-#. color light_water
+#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33351,5 +33428,5 @@
 #. <condition k="amenity" v="driving_school"/>
 #. <icon annotate="true" src="education/driving_school.png"/>
-#. color health
+#. color amenity_light
 #. <icon annotate="true" src="health/veterinary.png"/>
 #. <scale_min>1</scale_min>
@@ -33527,4 +33604,5 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
+#. color amenity_light
 #: build/trans_style.java:2127 build/trans_style.java:2142
 #: build/trans_style.java:2150 build/trans_style.java:2158
@@ -33550,5 +33628,4 @@
 msgstr "アメニティ_信号"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33566,5 +33643,5 @@
 #. <condition k="amenity" v="fountain"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#. color military
+#. color light_water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33576,4 +33653,5 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
+#. color light_water
 #: build/trans_style.java:2205 build/trans_style.java:2213
 #: build/trans_style.java:3468
@@ -33581,5 +33659,4 @@
 msgstr "信号_水域"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33636,4 +33713,5 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
+#. color health
 #: build/trans_style.java:2391 build/trans_style.java:2399
 #: build/trans_style.java:2407 build/trans_style.java:2416
@@ -33643,5 +33721,4 @@
 msgstr "健康"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33998,4 +34075,5 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
 #: build/trans_style.java:2625 build/trans_style.java:2633
 #: build/trans_style.java:2641 build/trans_style.java:2649
@@ -34023,5 +34101,4 @@
 msgstr "店"
 
-#. color shop
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34089,4 +34166,5 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
+#. color hotel
 #: build/trans_style.java:2980 build/trans_style.java:2988
 #: build/trans_style.java:2996 build/trans_style.java:3004
@@ -34096,5 +34174,4 @@
 msgstr "ホテル"
 
-#. color hotel
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34145,5 +34222,4 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
-#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34191,4 +34267,5 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
+#. color tourism
 #: build/trans_style.java:3044 build/trans_style.java:3052
 #: build/trans_style.java:3060 build/trans_style.java:3068
@@ -34199,5 +34276,4 @@
 msgstr "旅行関係"
 
-#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34281,4 +34357,5 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
+#. color historic
 #: build/trans_style.java:3141 build/trans_style.java:3149
 #: build/trans_style.java:3157 build/trans_style.java:3165
@@ -34289,5 +34366,4 @@
 msgstr "史跡"
 
-#. color green
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34296,9 +34372,9 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
+#. color quarry
 #: build/trans_style.java:3261
 msgid "quarry"
 msgstr "石切り場"
 
-#. color quarry
 #. <icon src="misc/landmark/mine.png"/>
 #. <scale_min>1</scale_min>
@@ -34308,9 +34384,9 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
+#. color landfill
 #: build/trans_style.java:3269
 msgid "landfill"
 msgstr "埋め立て地"
 
-#. color landfill
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -34328,9 +34404,9 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
+#. color basin
 #: build/trans_style.java:3277 build/trans_style.java:3285
 msgid "basin"
 msgstr "水たまり、窪地"
 
-#. color residential
 #. <icon src="misc/landuse/residential.png"/>
 #. <scale_min>1</scale_min>
@@ -34340,9 +34416,9 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
+#. color farmyard
 #: build/trans_style.java:3325
 msgid "farmyard"
 msgstr "農家の庭"
 
-#. color farmyard
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -34361,9 +34437,9 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
+#. color retail
 #: build/trans_style.java:3334 build/trans_style.java:3342
 msgid "retail"
 msgstr "小売りの商用地"
 
-#. color retail
 #. <icon src="misc/landuse/commercial.png"/>
 #. <scale_min>1</scale_min>
@@ -34373,9 +34449,9 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
+#. color industrial
 #: build/trans_style.java:3350
 msgid "industrial"
 msgstr "工業地"
 
-#. color industrial
 #. <icon src="misc/landmark/works.png"/>
 #. <scale_min>1</scale_min>
@@ -34385,9 +34461,9 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
+#. color brownfield
 #: build/trans_style.java:3358
 msgid "brownfield"
 msgstr "使用していない工業地"
 
-#. color brownfield
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -34397,9 +34473,9 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
+#. color greenfield
 #: build/trans_style.java:3366
 msgid "greenfield"
 msgstr "緑地"
 
-#. color greenfield
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -34409,9 +34485,9 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
+#. color railland
 #: build/trans_style.java:3374
 msgid "railland"
 msgstr "鉄道公園"
 
-#. color construction
 #. <icon src="misc/construction.png"/>
 #. <scale_min>1</scale_min>
@@ -34421,5 +34497,5 @@
 #. <rule>
 #. <condition k="landuse" v="military"/>
-#. color green
+#. color military
 #. <icon src="leisure/common.png"/>
 #. <scale_min>1</scale_min>
@@ -34464,4 +34540,5 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
+#. color military
 #: build/trans_style.java:3391 build/trans_style.java:3426
 #: build/trans_style.java:3434 build/trans_style.java:3442
@@ -34470,5 +34547,4 @@
 msgstr "軍用地"
 
-#. color military
 #. <icon src="vehicle/tank.png"/>
 #. <scale_min>1</scale_min>
@@ -34478,9 +34554,9 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
+#. color cemetery
 #: build/trans_style.java:3399
 msgid "cemetery"
 msgstr "共同墓地"
 
-#. color light_water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34489,9 +34565,9 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
+#. color peak
 #: build/trans_style.java:3475
 msgid "peak"
 msgstr "山頂"
 
-#. color peak
 #. <icon annotate="true" src="misc/landmark/peak_small.png"/>
 #. <scale_min>1</scale_min>
@@ -34502,9 +34578,9 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
+#. color glacier
 #: build/trans_style.java:3484
 msgid "glacier"
 msgstr "氷河"
 
-#. color glacier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34514,9 +34590,9 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
+#. color volcano
 #: build/trans_style.java:3492
 msgid "volcano"
 msgstr "火山"
 
-#. color volcano
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34527,5 +34603,4 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34535,5 +34610,5 @@
 #. <condition k="natural" v="scree"/>
 #. <icon src="misc/no_icon.png"/>
-#. color scrub
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34543,5 +34618,5 @@
 #. <condition k="natural" v="fell"/>
 #. <icon src="misc/no_icon.png"/>
-#. color beach
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34567,4 +34642,5 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="vehicle/tunnel.png"/>
+#. color natural
 #: build/trans_style.java:3500 build/trans_style.java:3501
 #: build/trans_style.java:3509 build/trans_style.java:3525
@@ -34574,5 +34650,4 @@
 msgstr "自然"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34582,9 +34657,9 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
+#. color scrub
 #: build/trans_style.java:3517
 msgid "scrub"
 msgstr "低木"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34594,9 +34669,9 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
+#. color heath
 #: build/trans_style.java:3533
 msgid "heath"
 msgstr "荒地"
 
-#. color heath
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34606,9 +34681,9 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
+#. color woodarea
 #: build/trans_style.java:3541
 msgid "woodarea"
 msgstr "森林エリア"
 
-#. color water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34618,9 +34693,9 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
+#. color mud
 #: build/trans_style.java:3573
 msgid "mud"
 msgstr "泥"
 
-#. color mud
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34630,9 +34705,9 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
+#. color beach
 #: build/trans_style.java:3581
 msgid "beach"
 msgstr "砂浜"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34706,4 +34781,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
+#. color route
 #: build/trans_style.java:3621 build/trans_style.java:3629
 #: build/trans_style.java:3637 build/trans_style.java:3645
@@ -34713,5 +34789,4 @@
 msgstr "ルート"
 
-#. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -34796,4 +34871,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
+#. color boundary
 #: build/trans_style.java:3687 build/trans_style.java:3695
 #: build/trans_style.java:3699 build/trans_style.java:3703
@@ -34807,5 +34883,4 @@
 msgstr "行政区境"
 
-#. color deprecated
 #. <icon src="misc/landmark/mountain_pass.png"/>
 #. <scale_min>1</scale_min>
@@ -34951,4 +35026,5 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
+#. color place
 #: build/trans_style.java:4240 build/trans_style.java:4248
 #: build/trans_style.java:4256 build/trans_style.java:4264
@@ -34961,5 +35037,4 @@
 msgstr "場所"
 
-#. color place
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34969,4 +35044,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
+#. color tiger_data
 #: build/trans_style.java:4344
 msgid "tiger_data"
@@ -34978,68 +35054,68 @@
 #. <!-- action class: either fully qualified classnames or if not found,
 #. package at.dallermassl.josm.plugin.surveyor.action is assumed -->
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
 msgstr "トンネルの開始"
 
-#. <button label="Bridge" hotkey="B" type="toggle">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="bridge"/>
 #. </button>
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #: build/trans_surveyor.java:16
 msgid "Village/City"
 msgstr "村・市"
 
-#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Parking"/>
 #. </button>
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #: build/trans_surveyor.java:29
 msgid "One Way"
 msgstr "一方通行"
 
-#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
 #. </button>
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #: build/trans_surveyor.java:33
 msgid "Church"
 msgstr "教会"
 
-#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
 #. <action class="SetWaypointAction" params="Church"/>
 #. </button>
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #: build/trans_surveyor.java:38
 msgid "Fuel Station"
 msgstr "ガソリンスタンド"
 
-#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
 #. <action class="SetWaypointAction" params="Restaurant"/>
 #. </button>
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #: build/trans_surveyor.java:52
 msgid "Shopping"
 msgstr "買い物"
 
-#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #: build/trans_surveyor.java:56
 msgid "WC"
 msgstr "トイレ"
 
-#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #: build/trans_surveyor.java:60
 msgid "Camping"
 msgstr "キャンプ場"
 
-#. <button label="Residential" hotkey="5">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Residential"/>
@@ -35050,4 +35126,5 @@
 #. <action class="SetWaypointAction" params="Test X"/>
 #. </button>
+#. <button label="Test" hotkey="F12">
 #: build/trans_surveyor.java:93 build/trans_surveyor.java:97
 msgid "Test"
@@ -35089,23 +35166,24 @@
 #.
 #. Empty lines and space signs are ignored
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
 #: build/trans_validator.java:38
 msgid "abbreviated street name"
 msgstr "簡略化されたストリート名"
 
-#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#. node : W : oneway == *
 #: build/trans_validator.java:40
 msgid "oneway tag on a node"
 msgstr "単一ノードに一方通行のタグ"
 
-#. node : W : oneway == *
+#. node : W : bridge == BOOLEAN_TRUE
 #: build/trans_validator.java:41
 msgid "bridge tag on a node"
 msgstr "単一ノードに橋梁のタグ"
 
-#. node : W : bridge == BOOLEAN_TRUE
 #. node : W : highway == tertiary
 #. node : W : highway == secondary
 #. node : W : highway == residential
 #. node : W : highway == unclassified
+#. node : W : highway == track
 #: build/trans_validator.java:42 build/trans_validator.java:43
 #: build/trans_validator.java:44 build/trans_validator.java:45
@@ -35114,12 +35192,12 @@
 msgstr "ノード上の誤った高速道路タグ"
 
-#. node : W : highway == track
+#. way  : W : highway == unclassified && name != *
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
 msgstr "名前のない一般道(2車線未満)"
 
-#. way  : W : highway == unclassified && name != *
 #. way  : I : highway == secondary && ref != *
 #. way  : I : highway == tertiary && ref != *
+#. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:48 build/trans_validator.java:49
 #: build/trans_validator.java:50
@@ -35127,70 +35205,70 @@
 msgstr "参照のない道路"
 
-#. way  : I : highway == motorway && nat_ref != *
+#. *    : W : highway == road
 #: build/trans_validator.java:51
 msgid "temporary highway type"
 msgstr "一時的な道路タイプ"
 
-#. *    : W : highway == road
+#. *    : W : / *name
 #: build/trans_validator.java:52
 msgid "misspelled key name"
 msgstr "スペルの間違ったキー名"
 
-#. *    : W : / *name */i == * && name != *
 #. The following could replace unnamed way check. Still at the moment we keep it as it is
 #. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
 msgstr "bicycleタグつきの自転車道"
 
-#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
 msgstr "footタグつきの遊歩道"
 
-#. way  : W : highway == footway && foot == BOOLEAN_FALSE
 #. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
+#. way  : W : highway == cycleway && cycleway == lane
 #: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
 msgstr "自転車道のレーンとしてウェイを分離する"
 
-#. way  : W : highway == cycleway && cycleway == lane
+#. way  : W : highway == * && barrier == *
 #: build/trans_validator.java:63
 msgid "barrier used on a way"
 msgstr "路上のバリア"
 
-#. way  : W : highway == * && barrier == *
 #. way  : I : waterway == * && layer != *                         # waterway without layer tag
 #. way  : I : highway == footway && maxspeed == *
+#. way  : I : highway == steps && maxspeed == *
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
 msgstr "遊歩道に最大速度が指定"
 
-#. way  : I : highway == steps && maxspeed == *
+#. *    : W : layer == /\+.
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
 msgstr "+ sign付きのlayerタグ"
 
-#. *    : W : layer == /\+.*/
+#. *    : I : name == /.*Strasse.
 #: build/trans_validator.java:71
 msgid "street name contains ss"
 msgstr "ストリート名は ss を含んでいます。"
 
-#. *    : I : name == /.*Strasse.*/i
+#. relation : E : type != *
 #: build/trans_validator.java:73
 msgid "relation without type"
 msgstr "typeのないリレーション"
 
-#. relation : E : type != *
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
 #: build/trans_validator.java:75
 msgid "restaurant without name"
 msgstr "名前のないレストラン"
 
-#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
 #. *    : W : natural == water && waterway == *                   # unusual tag combination
 #. *    : W : highway == * && waterway == *
+#. *    : W : highway == * && natural == *
 #: build/trans_validator.java:78 build/trans_validator.java:79
 msgid "unusual tag combination"
@@ -35201,132 +35279,133 @@
 #. NOTE: default items should be common and worldwide
 #.
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:5
 msgid "Landsat"
 msgstr "ランドサット"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
+#. http://irs.gis-lab.info/?layers=landsat&
 #: build/trans_wms.java:6
 msgid "Landsat (mirror)"
 msgstr ""
 
-#. http://irs.gis-lab.info/?layers=landsat&
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #: build/trans_wms.java:7
 msgid "Open Aerial Map"
 msgstr "オープンエアリアルマップ"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #.
 #. different forms for web access
 #. must be html:<url>
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:11
 msgid "Yahoo Sat"
 msgstr "Yahoo 衛星"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:12
 msgid "OpenStreetMap"
 msgstr "OpenStreetMap"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:13
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
 #: build/trans_wms.java:14
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
 #.
 #.
 #. only for Germany
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
 #: build/trans_wms.java:18
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
 #.
 #.
 #. only for North America
 #. Terraserver USCG - High resolution maps
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
 #: build/trans_wms.java:24
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
 #.
 #.
 #. only for Czech Republic
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
 #: build/trans_wms.java:28
 msgid "Czech CUZK:KM"
 msgstr "チェコ CUZK:KM"
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
 #: build/trans_wms.java:29
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "チェコ UHUL:ORTOFOTO"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
 #.
 #.
 #. only for GB
 #. fails with division by zero error
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:34
 msgid "NPE Maps"
 msgstr "NPEマップ"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
 #: build/trans_wms.java:35
 msgid "NPE Maps (Tim)"
 msgstr "NPEマップ(Tim)"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
 #: build/trans_wms.java:36
 msgid "7th Series (OS7)"
 msgstr "7番目のシリーズ (OS7)"
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
 #.
 #.
 #. only for Japan
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:40
 msgid "MLIT Japan (ORTHO)"
 msgstr "国土交通省 (オルソ)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO01)"
 msgstr "国土交通省 (オルソ01)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO02)"
 msgstr "国土交通省 (オルソ02)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:43
 msgid "MLIT Japan (ORTHO03)"
 msgstr "国土交通省 (オルソ03)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #.
 #.
 #. only for Italy
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:47
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:48
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
+#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
@@ -37234,2 +37313,5 @@
 #~ "接続されたセグメントはアラインできません。\n"
 #~ "ノードを共有していない２つのセグメントを選択してください。"
+
+#~ msgid "Seamark Editor"
+#~ msgstr "Seamarkエディタ"